Changeset 1094

Timestamp:

19 Dec 2006, 12:11:44 (18 years ago)

Author:

Henrik Bettermann

Message:

context.setupCurrentSkin() after login enabled for all

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (1 diff)
• waeup_student/delete_student_from_catalog.py (modified) (1 diff)
• waeup_student/refresh_certificate_info.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -84 +84 @@
                 app_doc.edit(mapping = da)
         if s_review_state == "application_pin_entered":
-            return response.redirect("%s/application_edit_form" % student.absolute_url())
+            rdirect_url = "%s/application_edit_form" % student.absolute_url()
         elif s_review_state in ('admitted', 'objection_raised',):
-            return response.redirect("%s/admission_form" % student.absolute_url())
+            redirect_url = "%s/admission_form" % student.absolute_url()
         elif s_review_state == "clearance_pin_entered":
-            return response.redirect("%s/clearance_edit_form" % student.absolute_url())
-        return response.redirect("%s/student_index" % student.absolute_url())
+            redirect_url = "%s/clearance_edit_form" % student.absolute_url()
+        redirect_url = "%s/student_index" % student.absolute_url()
     else:
         logger.info('"%s", "logged in"' % (member))
-        return response.redirect(portal.absolute_url())
+        redirect_url = portal.absolute_url()
+#Anonymous
 else:
-        # Setup skins
-    if (getattr(utool, 'updateSkinCookie', False) and
-        utool.updateSkinCookie()):
-        context.setupCurrentSkin()
     response.expireCookie('__ac', path='/')
     return context.user_logged_in_failed()
 
+# Setup skins
+if (getattr(utool, 'updateSkinCookie', False) and
+    utool.updateSkinCookie()):
+    context.setupCurrentSkin()
 
+response.redirect(redirect_url)
+

WAeUP_SRP/trunk/skins/waeup_student/delete_student_from_catalog.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=id=[], REQUEST=None
+##parameters=id=None, REQUEST=None
 ##title=
 ##

WAeUP_SRP/trunk/skins/waeup_student/refresh_certificate_info.py

@@ -18 +18 @@
 s_cat = context.students_catalog
 s_res = s_cat(course = certid)
-from Products.zdb import set_trace
-set_trace()
+#from Products.zdb import set_trace
+#set_trace()
 if not s_res:
     return "No students for %s not found"
 refreshed = []
 refreshed.append("Record started")
-for student_id in [st.id  for st in s_res]: 
+for student_id in [st.id  for st in s_res]:
     s_cat.modifyRecord(id = student_id,
                        course = course,