Changeset 1581

Timestamp:

19 Mar 2007, 10:06:30 (18 years ago)

Author:

joachim

Message:

set role CourseAdviser? also for the Student object, if the member is
CourseAdviser? for one of the StudyLevels? in the Students study_course.

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSUserFolderUserFolder.py (modified) (4 diffs)
• skins/waeup_default/isCourseAdviser.py (modified) (1 diff)

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py

@@ -71 +71 @@
     ## patch to assign dynamic roles for WAeUP
     while 1:
-        #from pdb import set_trace;set_trace()
         if self.isStudent():
             break
@@ -87 +86 @@
                                                    "StudentStudyLevel"):
             break
-
+        # don't test if it is not a proxy 
+        if real_object.portal_type == real_object.meta_type:
+            break
         # can be later simplified by replacing by students_catalog values - Henrik
         # getattr works always because of acquisition ?! Henrik
@@ -93 +94 @@
         if sc is None:
             break
+        #from pdb import set_trace;set_trace()
         sc_obj = sc.getContent()
         cert_id = sc_obj.study_course
@@ -119 +121 @@
                                                 )
         if real_object.portal_type == "StudentStudyLevel":
-            if real_object.meta_type == "StudentStudyLevel":
-                #if it is not a Proxy
-                break
             context_obj = getattr(certificate_obj,real_object.getId(),None)
             if context_obj is None:
                 break
-            allowed = ('CourseAdviser', 'SectionManager')
+            allowed = set(('CourseAdviser', 'SectionManager'))
+        elif real_object.portal_type == "Student" and "CourseAdvisers" in groups:
+            #we need some special processing since CourseAdvisers are only 
+            #specified per StudyLevel
+            allowed = set(('CourseAdviser', 'SectionManager'))
+            for context_obj in certificate_obj.objectValues():
+                dynamic_roles = set(self.getRolesInContext(context_obj))
+                intersect = dynamic_roles & allowed
+                if intersect:
+                    roles.extend(list(intersect))
+            break
         else:
             res = self.portal_catalog(portal_type="Department",id=dep_id)
-            allowed = ('ClearanceOfficer', 'SectionManager')
+            allowed = set(('ClearanceOfficer', 'SectionManager'))
             if len(res) != 1:
                 break
             context_obj = res[0].getObject()
-        dynamic_roles = self.getRolesInContext(context_obj)
-        for dr in allowed:
-            if dr in dynamic_roles:
-                roles.append(dr)
+        dynamic_roles = set(self.getRolesInContext(context_obj))
+        intersect = dynamic_roles & allowed
+        if intersect:
+            roles.extend(list(intersect))
         break
     return roles

WAeUP_SRP/trunk/skins/waeup_default/isCourseAdviser.py

@@ -9 +9 @@
 ##
 # $Id: isClearanceOfficer.py 1087 2006-12-18 22:13:31Z joachim $
-
-#from Products.zdb import set_trace
-#set_trace()
 if context.isStudent():
     return False