Changeset 587 for WAeUP_SRP/trunk

Timestamp:

28 Sep 2006, 22:32:26 (18 years ago)

Author:

joachim

Message:

changed layout in student_search

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/student_search.xml (modified) (1 diff)
• profiles/default/vocabularies/search_mode_voc.xml (modified) (1 diff)
• skins/waeup_student/searchStudents.py (modified) (3 diffs)

WAeUP_SRP/trunk/profiles/default/layouts/student_search.xml

@@ -4 +4 @@
  <property name="layout_edit_method"></property>
  <property name="layout_view_method"></property>
- <property name="style_prefix">layout_application_</property>
+ <property name="style_prefix">layout_search_</property>
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>

WAeUP_SRP/trunk/profiles/default/vocabularies/search_mode_voc.xml

@@ -9 +9 @@
  <item key="matric_no" msgid="">Matriculation Number</item>
  <item key="jamb_id" msgid="">Jamb Id</item>
+ <item key="review_state" msgid="">Review State</item>
 </object>

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -32 +32 @@
 default = {'search_mode': 'name', 
         'review_state': 'admission_applied ', 
-        'search_string': 'yy'
+        'search_string': ''
         }
         
@@ -55 +55 @@
 if state == " ----- ":
     state = ''
+if not term and what in ('student_edit','jamb_id','name','matric_no'):
+    return context.students_manager_view(rendered = rend,
+                             psm = "You must specify a search string",
+                             #psm = "%s, %s" % (psm,ds),
+                             students = items,
+                             is_manager = is_manager,
+                             )
 onlyreview = state and what == "review_state"
 items = []
@@ -64 +71 @@
 elif what == "student_id":
     res = catalog(portal_type='Student',
-                  id = student_id.strip())
+                  id = term.strip())
 elif what == "jamb_id":
     res = catalog(portal_type='StudentApplication',