Changeset 999 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

6 Dec 2006, 10:46:32 (18 years ago)

Author:

joachim

Message:

edit app_ac_pin if not set (logged_in.py)
set default to all states (search students)

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• check_admission.py (modified) (2 diffs)
• search_students.py (modified) (1 diff)
• student_index.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -48 +48 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
+<<<<<<< .mine
+    if is_anon and not s_id:
+        return context.check_admission_pin_form(rendered = res,
+                                 psm = "You are not allowed to do this in this context",
+                                 #psm = "%s, %s" % (psm,ds),
+                                 firstlayout = True,
+                                 lastlayout = True,
+                                 ds = ds,
+                                 )
+    elif not is_anon:
+        return context.check_admission_pin_form(rendered = res,
+                                 psm = "You are logged in",
+                                 #psm = "%s, %s" % (psm,ds),
+                                 firstlayout = True,
+                                 lastlayout = True,
+                                 ds = ds,
+                                 )
+=======
     if is_anon and not s_id:
         return context.check_admission_pin_form(rendered = res,
@@ -64 +82 @@
                                  ds = ds,
                                  )
+>>>>>>> .r998
 ##  
 ##    email = ds.get('app_email')

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -50 +50 @@
 validate = request.has_key("cpsdocument_edit_button")
 default = {'search_mode': 'name',
-        'review_state': 'clearance_requested',
+        'review_state': 'all',
         'search_string': ''
         }

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -16 +16 @@
 redirect = request.RESPONSE.redirect
 pm = context.portal_membership
+member = pm.getAuthenticatedMember()
 
 if context.isStaff():
@@ -25 +26 @@
         return context.clearance_view()
     elif context.portal_type == 'Student':
-        return redirect("%s/student_view" % context.absolute_url())
+        return redirect("%s/student_view" % context.absolute_url())
     return redirect("%s/waeup_document_view" % context.absolute_url())
 if context.isStudent():
-    info = context.getStudentInfo()
-    student = info['student']
+    students = context.portal_url.getPortalObject().campus.students
+    student = getattr(students,str(member))
     return redirect("%s/student_view" % student.absolute_url())