Changeset 3904 for WAeUP_SRP/trunk/skins/waeup_student/search_students.py

Timestamp:

3 Feb 2009, 10:01:33 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve #605, show correct student list

File:

• WAeUP_SRP/trunk/skins/waeup_student/search_students.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -75 +75 @@
     user_info['faculties'] = session_data['faculties'] = faculties
     user_info['departments'] = session_data['departments'] =  departments
-elif "CourseAdvisers" in member.getGroups():
+if "CourseAdvisers" in member.getGroups():
     default_state = "courses_registered"
     ca_view = True
@@ -194 +194 @@
 
 # build query string part 3
-if co_view:
+if co_view and state.startswith('clear'):
     if query is not None:
         query = query & In('faculty',faculties) | In('department',departments)
     else:
         query = In('faculty',faculties) | In('department',departments)
-elif ca_view:
+elif ca_view and state.startswith('courses'):
     courses = [cl.split('/')[0] for cl in certificate_levels]
     levels = [cl.split('/')[1] for cl in certificate_levels]
@@ -229 +229 @@
                              students = students,
                              allowed = allowed,
-                             co_view = co_view,
-                             ca_view = ca_view
+                             co_view = state.startswith('clear'),
+                             ca_view = state.startswith('courses')
                              )
 return context.search_students_form(rendered = rend,