Changeset 886

Timestamp:

17 Nov 2006, 16:27:37 (18 years ago)

Author:

joachim

Message:

removed co_searchStudents

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• co_searchStudents.py (deleted)
• searchStudents.py (modified) (5 diffs)
• students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -1 @@
-## Script (Python) "searchStudents"
+## Script (Python) "co_searchStudents"
 ##bind container=container
 ##bind context=context
@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=
+##parameters=REQUEST
 ##title=
 ##
 # $Id$
 """
-return Info about the current Student
+list Students for ClearanceOfficers
 """
+request = REQUEST
+wftool = context.portal_workflow
+mtool = context.portal_membership
+member = mtool.getAuthenticatedMember()
+roles = member.getRolesInContext(context)
 try:
     from Products.AdvancedQuery import Eq, Between, Le,In
@@ -44 +49 @@
 pr = context.portal_registration
 path_info = request.get('PATH_INFO').split('/')
-is_manager = context.isManager
+is_manager = context.isManager()
 validate = request.has_key("cpsdocument_edit_button")
 default = {'search_mode': 'name',
-        'review_state': 'all',
+        'review_state': 'clearance_requested',
         'search_string': ''
         }
@@ -155 +160 @@
 if items:
     for item in items:
-        info = context.getStudentInfo(item)
-        students.append(info)
+        #if context.isClearanceOfficer(info):
+        if "ClearanceOfficers" in member.getGroups():
+            droles = member.getRolesInContext(item)
+            if "ClearanceOfficer" in droles:
+                info = context.getStudentInfo(item)
+                students.append(info)
+        else:
+            info = context.getStudentInfo(item)
+            students.append(info)
+                
     return context.students_manager_view(rendered = rend,
-                             psm = "%d,%d matching Students found QS = %s" %\
-                                    (len(review_set),len(search_set),query_step),
+                             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,
@@ -169 +183 @@
                              allowed = True,
                              )
+
+

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -24 +24 @@
 
 if "ClearanceOfficers" in member.getGroups():
-    return redirect("%s/co_searchStudents" % students_url)
+    return redirect("%s/searchStudents" % students_url)
 if context.isManager():
     return redirect("%s/searchStudents" % students_url)