Changeset 15163 for main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

Timestamp:

23 Sep 2018, 05:05:04 (6 years ago)

Author:

Henrik Bettermann

Message:

Merge with /main/waeup.kofa/branches/henrik-transcript-workflow:15127-15162

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/students/catalog.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

@@ -29 +29 @@
 from waeup.kofa.students.interfaces import IStudent, ICourseTicket
 from waeup.kofa.university.vocabularies import course_levels
+from waeup.kofa.students.workflow import (TRANSREQ, TRANSVAL)
 
 class StudentsCatalog(grok.Indexes):
@@ -88 +89 @@
                 hitlist.append(StudentQueryResultItem(student, view=view))
         return hitlist
-    elif searchtype == 'transcript':
+    elif searchtype in (TRANSREQ, TRANSVAL):
         cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(
-            state=('transcript requested', 'transcript requested'))
+        results = cat.searchResults(state=(searchtype, searchtype))
     else:
         # Temporary solution to display all students added