Changeset 885 for WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py

Timestamp:

17 Nov 2006, 16:06:47 (18 years ago)

Author:

joachim

Message:

cleaned up several things:

1. the definitions for isManager, isStaff, and isClearanceOfficer

are now independant from eachother only based on roles or groups.
The Manager-Role is the superuser-role,
the is-Scripts document what is what.

since isStaff returns false if the member only has Manager-role,
in .cpsskins_theme it must now be:

if context.isStaff() or context.isManager():

return 'WAeUP_Backoffice'

todo: finish the merge of co_searchStudents and searchStudents

File:

• WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py

@@ -49 +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',
@@ -69 +69 @@
                              #psm = "%s, %s" % (psm,ds),
                              students = items,
-                             is_manager = is_manager,
+                             allowed = True,
                              )
 what = ds.get('search_mode')
@@ -92 +92 @@
                              #psm = "%s, %s" % (psm,ds),
                              students = items,
-                             is_manager = is_manager,
+                             allowed = True,
                              )
 items = []
@@ -165 +165 @@
             info = context.getStudentInfo(item)
             students.append(info)
-    return context.students_co_view(rendered = rend,
+    return context.students_manager_view(rendered = rend,
                              psm = "",
                              #psm = "%d,%d matching Students found QS = %s" %\
@@ -171 +171 @@
                              #psm = "%d found QS = %s items: %s" % (len(items),query_step,items),
                              students = students,
-                             is_manager = is_manager,
+                             allowed = True,
                              )
-return context.students_co_view(rendered = rend,
+return context.students_manager_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,
-                             is_manager = is_manager,
+                             allowed = True,
                              )