Changeset 883 for WAeUP_SRP/trunk/skins

Timestamp:

17 Nov 2006, 08:18:52 (18 years ago)

Author:

joachim

Message:

getRolesInContext now does additional checks for ClearanceOfficer?.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• co_searchStudents.py (modified) (1 diff)
• getStudentInfo.py (modified) (2 diffs)
• students_co_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search_view.pt) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py

@@ -165 +165 @@
             info = context.getStudentInfo(item)
             students.append(info)
-    return context.co_search_view(rendered = rend,
-                             psm = "%d,%d matching Students found QS = %s" %\
-                                    (len(review_set),len(search_set),query_step),
+    return context.students_co_view(rendered = rend,
+                             psm = "",
+                             #psm = "%d,%d matching Students found QS = %s" %\
+                             #       (len(review_set),len(search_set),query_step),
                              #psm = "%d found QS = %s items: %s" % (len(items),query_step,items),
                              students = students,
                              is_manager = is_manager,
                              )
-return context.co_search_view(rendered = rend,
+return context.students_co_view(rendered = rend,
                              psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools),
                              students = students,

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -19 +19 @@
 member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRoles()
 
 info = {}
@@ -34 +33 @@
 else:
     student_id = student.getId()
+roles = member.getRoles()
 student_path = "%s/campus/students/%s" % (context.portal_url.getPortalPath(),student_id)
 student = context.restrictedTraverse(student_path,default=None)

WAeUP_SRP/trunk/skins/waeup_student/students_co_view.pt

@@ -64 +64 @@
                 <td><span tal:replace="python: student['app_doc'].jamb_reg_no" /></td>    
                 <td><a href="id" 
-                       tal:attributes="href string:${student/student/clearance/absolute_url}"
+                       tal:attributes="href string:${student/student/clearance/absolute_url}/clearance_edit_form_manager"
                        tal:content="student/review_state"></a></td>    
                 <td>