Changeset 603 for WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

Timestamp:

1 Oct 2006, 10:21:09 (18 years ago)

Author:

Henrik Bettermann

Message:

batch of fixes to open the frontend for the first time

File:

• WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py (modified) (6 diffs)

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -22 +22 @@
 info['wf_states'] = student_wf_states
 info['wf_states'][0] = " ----- "
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 lt = context.portal_layouts
 pr = context.portal_registration
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRoles()
-is_manager = 'Manager' in roles or 'SectionManager' in roles
+is_manager = context.isManager
 validate = request.has_key("cpsdocument_edit_button")
 items = []
-default = {'search_mode': 'name', 
-        'review_state': 'admission_applied ', 
+default = {'search_mode': 'name',
+        'review_state': 'created',
         'search_string': ''
         }
-        
+
 rend,psm,ds = lt.renderLayout(layout_id= 'student_search',
                       schema_id= 'student_search',
@@ -57 +54 @@
 with_review = state != "all"
 if not term and not with_review:
-    psm = "You must specify a search string when searching in 'All States'"
+    psm = "You must specify a search string when searching 'all states'."
     err = True
 elif '*' in term:
     psm = "you cannot use the '*' alone"
     err = True
-if err: 
+if err:
     return context.students_manager_view(rendered = rend,
                              psm = psm,
@@ -73 +70 @@
 res = []
 portal_type_query = {'query':['Student','StudentApplication','StudentPersonal']}
-st_queries = ('jamb_id','matric_no','name')
+st_queries = ('jamb_reg_no','matric_no','name')
 onlyreview = with_review and not term
 if onlyreview:
@@ -86 +83 @@
         res = catalog(portal_type='Student',
                       id = term.strip())
-elif what in st_queries: 
-    if what == "jamb_id":
+elif what in st_queries:
+    if what == "jamb_reg_no":
         pt = 'StudentApplication'
         st = "%s*" % term.strip().lower()
@@ -102 +99 @@
         except:
             return context.students_manager_view(rendered = rend,
-                                 psm = 'Searchstring "%s" not allowed' % term,
+                                 psm = 'Search string "%s" not allowed.' % term,
                                  #psm = "%s, %s" % (psm,ds),
                                  students = items,
@@ -117 +114 @@
                                  is_manager = is_manager,
                                  )
-            
+
 if res:
     for r in res: