Changeset 883 for WAeUP_SRP/trunk

Timestamp:

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

Author:

joachim

Message:

getRolesInContext now does additional checks for ClearanceOfficer?.

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSUserFolderUserFolder.py (modified) (1 diff)
• PatchCPSUserFolderUserFolderWithGroups.py (modified) (1 diff)
• profiles/default/workflows/waeup_student_subobject_wf/definition.xml (modified) (1 diff)
• profiles/default/workflows/waeup_student_wf/definition.xml (modified) (3 diffs)
• skins/waeup_student/co_searchStudents.py (modified) (1 diff)
• skins/waeup_student/getStudentInfo.py (modified) (2 diffs)
• skins/waeup_student/students_co_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search_view.pt) (1 diff)

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py

@@ -73 +73 @@
         if not hasattr(real_object,'portal_type'):
             break
-        if real_object.portal_type != "Student":
+        if real_object.portal_type not in ("Student","StudentClearance"):
             break
         #import pdb;pdb.set_trace()

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolderWithGroups.py

@@ -123 +123 @@
     return None
 
-from Products.CPSUserFolder import UserFolderWithGroups  
-UserFolderWithGroups.getRolesInContext = getRolesInContext
-UserFolderWithGroups.allowed = allowed
+from Products.CPSUserFolder.UserFolderWithGroups import PatchBasicUser  
+PatchBasicUser.getRolesInContext = getRolesInContext
+PatchBasicUser.allowed = allowed

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml

@@ -94 +94 @@
 
   <guard>
+   <guard-role>ClearanceOfficer</guard-role>
    <guard-role>Manager</guard-role>
    <guard-role>SectionManager</guard-role>

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml

@@ -49 +49 @@
   <permission-map name="Modify portal content"
                   acquired="True">
+    <permission-role>ClearanceOfficer</permission-role>
   </permission-map>
   <permission-map name="View" acquired="True">
@@ -57 +58 @@
   <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="reject_clearance"/>
+  <permission-map name="Modify portal content"
+                  acquired="True">
+    <permission-role>ClearanceOfficer</permission-role>
+  </permission-map>
   <permission-map name="View" acquired="True">
    <permission-role>Owner</permission-role>
@@ -65 +70 @@
  </state>
  <state state_id="finally_rejected" title="">
+  <permission-map name="Modify portal content"
+                  acquired="True">
+    <permission-role>ClearanceOfficer</permission-role>
+  </permission-map>
   <permission-map name="View" acquired="True">
    <permission-role>Owner</permission-role>

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>