Changeset 3903 for WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py

Timestamp:

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

Author:

Henrik Bettermann

Message:

resolve #605

File:

• WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py (modified) (1 diff)

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()