Changeset 3903

Timestamp:

3 Feb 2009, 08:19:08 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve #605

Location:

WAeUP_SRP/trunk

Files:

• patches/PatchCPSUserFolderUserFolder.py (modified) (2 diffs)
• skins/waeup_student/get_searchable_student_states.py (modified) (1 diff)

WAeUP_SRP/trunk/patches/PatchCPSUserFolderUserFolder.py

@@ -125 +125 @@
                     break
             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
-            certificate_obj = getCertificateObject(self,st_entry)
-            if certificate_obj is None:
-                #from pdb import set_trace;set_trace()
-                break
-            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=st_entry.department)
@@ -149 +135 @@
         if intersect:
             roles.extend(list(intersect))
+        #from pdb import set_trace;set_trace()            
+
+        if real_object.portal_type == "Student" and "CourseAdvisers" in groups:
+            #we need some special processing since CourseAdvisers are only
+            #specified per StudyLevel
+            certificate_obj = getCertificateObject(self,st_entry)
+            if certificate_obj is None:
+                #from pdb import set_trace;set_trace()
+                break
+            allowed = set(('CourseAdviser', 'SectionManager'))
+            for context_obj in certificate_obj.objectValues():
+                dynamic_roles = set(self.getRolesInContext(context_obj))
+                intersect2 = dynamic_roles & allowed
+                if intersect2:
+                    roles.extend(list(intersect2))
+
         break
     return roles

WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py

@@ -17 +17 @@
 roles = member.getRolesInContext(context)
 voc = context.portal_vocabularies.searchable_student_states
-
 if key is not None:
     return voc.get(key)
+voc_filtered = [('all', 'all states')] 
 if "ClearanceOfficers" in member.getGroups():
-    return [item for item in voc.items() if item[0].startswith('clear') or
-                                         item[0] in ("all",)]
-elif "CourseAdvisers" in member.getGroups():
-    return [item for item in voc.items() if item[0].startswith('courses') or
-                                         item[0] in ("all",)]
-return voc.items()
+    voc_filtered += [item for item in voc.items() if item[0].startswith('clear')]
+if "CourseAdvisers" in member.getGroups():
+    voc_filtered += [item for item in voc.items() if item[0].startswith('courses')]
+
+if len(voc_filtered) > 1:
+    return voc_filtered
+else:
+    return voc.items()