Changeset 663

Timestamp:

12 Oct 2006, 10:21:56 (18 years ago)

Author:

joachim

Message:

fixed searchStudents

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/types/Course.xml (modified) (1 diff)
• profiles/default/types/StudentClearance.xml (modified) (1 diff)
• profiles/default/types/StudentPersonal.xml (modified) (1 diff)
• skins/waeup_student/searchStudents.py (modified) (3 diffs)

WAeUP_SRP/trunk/profiles/default/types/Course.xml

@@ -14 +14 @@
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
+ <property name="cps_proxy_type">folderishdocument</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">

WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml

@@ -14 +14 @@
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type">document</property>
+ <property name="cps_proxy_type">folderishdocument</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">

WAeUP_SRP/trunk/profiles/default/types/StudentPersonal.xml

@@ -14 +14 @@
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type">document</property>
+ <property name="cps_proxy_type">folderishdocument</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -29 +29 @@
 items = []
 default = {'search_mode': 'name',
-        'review_state': 'created',
+        'review_state': 'all',
         'search_string': ''
         }
@@ -73 +73 @@
 onlyreview = with_review and not term
 if onlyreview:
-    res = catalog(portal_type=portal_type_query,
+    res = catalog(portal_type='Student',
                   review_state=state)
 elif what == "student_id":
@@ -93 +93 @@
         pt = portal_type_query
         st = "%s*" % term.strip()
-    if with_review:
-        try:
-            res = catalog(portal_type=pt,SearchableText=st,
-                          review_state=state)
-        except:
-            return context.students_manager_view(rendered = rend,
-                                 psm = 'Search string "%s" not allowed.' % term,
-                                 #psm = "%s, %s" % (psm,ds),
-                                 students = items,
-                                 is_manager = is_manager,
-                                 )
-    else:
-        try:
-            res = catalog(portal_type=pt,SearchableText=st,)
-        except:
-            return context.students_manager_view(rendered = rend,
-                                 psm = 'Searchstring "%s" not allowed' % term,
-                                 #psm = "%s, %s" % (psm,ds),
-                                 students = items,
-                                 is_manager = is_manager,
-                                 )
-
+    try:
+        res = catalog(portal_type=pt,SearchableText=st)
+    except:
+        return context.students_manager_view(rendered = rend,
+                             psm = 'Search string "%s" not allowed.' % term,
+                             #psm = "%s, %s" % (psm,ds),
+                             students = items,
+                             is_manager = is_manager,
+                             )
+students = []
 if res:
     for r in res:
         if r.portal_type in ("StudentApplication","StudentPersonal"):
             student = r.getObject().aq_parent
+##            pp = '/'.join(r.getPath().split('/')[:-1])
+##            student_cat = catalog(pathindex=pp,portal_type='Student')[0]
+##            student_rs = student_cat.review_state
+##            student = student_cat.getObject()
         else:
             student = r.getObject()
-        if student not in items:
-            items.append(student)
-students = []
+        student_rs = wf.getInfoFor(student,'review_state','keiner')
+        if with_review and student_rs != state:
+            continue
+        items.append(student)
 if items:
     for item in items:
         students.append(context.getStudentInfo(item))
-return context.students_manager_view(rendered = rend,
+    return context.students_manager_view(rendered = rend,
                              psm = "%d matching Students found" % len(items),
-                             #psm = "%s, %s" % (psm,ds),
                              students = students,
                              is_manager = is_manager,
                              )
+return context.students_manager_view(rendered = rend,
+                             psm = "Your search for %s in %s with state %s failed" % (st,what,state),
+                             students = students,
+                             is_manager = is_manager,
+                             )