Changeset 881 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

16 Nov 2006, 22:42:08 (18 years ago)

Author:

joachim

Message:

some fixes and renames

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• co_searchStudents.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search.py) (4 diffs)
• co_search_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search_form.pt)
• students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py

@@ -1 @@
-## Script (Python) "co_search"
+## Script (Python) "co_searchStudents"
 ##bind container=container
 ##bind context=context
@@ -62 +62 @@
                       ob=default,
                       layout_mode='edit',
-                      formaction="co_search"
+                      formaction="co_searchStudents"
                       )
 if psm == '':
@@ -160 +160 @@
 if items:
     for item in items:
-        info = context.getStudentInfo(item)
-        if context.isClearanceOfficer(info):
+        #if context.isClearanceOfficer(info):
+        droles = member.getRolesInContext(item)
+        if "ClearanceOfficer" in droles:
+            info = context.getStudentInfo(item)
             students.append(info)
-    return context.co_search_form(rendered = rend,
+    return context.co_search_view(rendered = rend,
                              psm = "%d,%d matching Students found QS = %s" %\
                                     (len(review_set),len(search_set),query_step),
@@ -170 +172 @@
                              is_manager = is_manager,
                              )
-return context.co_search_form(rendered = rend,
+return context.co_search_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/students_index.py

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