Changeset 1073 for WAeUP_SRP/trunk

Timestamp:

17 Dec 2006, 16:39:44 (18 years ago)

Author:

joachim

Message:

clearance_edit speed improvments.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• clearance_edit.py (modified) (1 diff)
• clearance_edit_form.pt (modified) (2 diffs)
• getClearanceInfo.py (added)
• search_students.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -30 +30 @@
 # (We don't call getEditableContent here, validate does it when needed.)
 wftool = context.portal_workflow
-info = context.getStudentInfo()
+info = context.getClearanceInfo()
 
 
 #'Sorry, you are not allowed to access this page!'
 if info == None:
-        #return REQUEST.RESPONSE.redirect(context.portal_url())
-        return REQUEST.RESPONSE.redirect(context.standard_error_message())
+  #return REQUEST.RESPONSE.redirect(context.portal_url())
+  return REQUEST.RESPONSE.redirect(context.standard_error_message())
 
 

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -1 +1 @@
 <metal:block define-macro="clearance_edit_form">
-<metal:block tal:define="info context/getStudentInfo">
+<metal:block tal:define="info context/getClearanceInfo">
   <span tal:condition="not: info">
     <metal:block use-macro="here/standard_error_message" />
@@ -12 +12 @@
            review_state info/review_state;
            clear_review_state info/clear_review_state;
-           editable python: (is_student and clear_review_state == 'opened' or is_so) and not is_co;
+           editable python:not is_co and (is_student and clear_review_state == 'opened' or is_so);
            mode python: test(editable,'edit','view');
            layout_id python: test(is_so,'student_clearance','student_clearance_fe');

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -157 +157 @@
     res = aq_students(query)
     search_set = [r.id for r in res]
-if with_review and len(search_set) > 0:
-    query = In('id',search_set) & Eq('review_state',state)
-elif with_review:
+##if with_review and len(search_set) > 0:
+##    query = In('id',search_set) & Eq('review_state',state)
+if with_review:
     query = Eq('review_state',state)
     review_res = evalAdvancedQuery(query)
@@ -168 +168 @@
         #review_set.append(pl[pl.index('students') + 1])
         review_set.append(r.getId)
-all = review_set
 #set_trace()
-##if only_review:
-##    all = review_set
-##elif with_review:
-##    for i in search_set:
-##        if i in review_set:
-##            all.append(i)
-##else:
-##    all = search_set
-####for a in all[:50]:
-####    if a in items:
-####        continue
-####    items.append(a)
+if only_review:
+    all = review_set
+elif with_review:
+    all = []
+    for i in search_set:
+        if i in review_set:
+            all.append(i)
+else:
+    all = search_set
 items = all[:500]
 students = []
-#items.sort()
-
 if items:
     for item in items: