Changeset 1030 for WAeUP_SRP/trunk/skins

Timestamp:

11 Dec 2006, 18:12:23 (18 years ago)

Author:

joachim

Message:

made Widgets.py from Widgets_neu.py
corrected a syntax-error in Widgets.py
added some doubleclick error-checking in start_clearance (checked into Custom)
catch ConflictError? in PinTable?.
clearance_edit_form modified to catch anonymous access.
search_students.py + students_index.py actually unchanged.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• clearance_edit_form.pt (modified) (2 diffs)
• search_students_form.pt (modified) (1 diff)
• start_clearance.py (modified) (3 diffs)
• students_index.py (modified) (1 diff)

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">
+  <span tal:condition="not: info">
+    <metal:block use-macro="here/error_not_found/macros/not_found" />
+  </span>
+<metal:block tal:condition="info"> 
 <tal:block define="
-           info context/getStudentInfo;
            is_so context/isSectionOfficer;
            is_staff context/isStaff;
@@ -46 +50 @@
 </tal:block>
 </metal:block>
+</metal:block>
+</metal:block>

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -35 +35 @@
       
         <span tal:replace="structure rendered" />
-        <tal:block tal:condition="python: batch_info and batch_info['nb_pages'] > 1">
+        <tal:block tal:condition="python: items and batch_info and batch_info['nb_pages'] > 1">
           <div class="batchLayout">
             <span i18n:translate="">

WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

@@ -23 +23 @@
 app_doc = info['app_doc']
 review_state = info['review_state']
-
+session = REQUEST.SESSION
 res,psm,ds = lt.renderLayout(layout_id='student_clearance',
                       schema_id= 'student_clearance',
@@ -41 +41 @@
                                  )
 error = False
-if app_doc.passport is None:
+if session.get("clicked",None):
+    psm = 'Please wait a moment, until "Clearance started" turns green, then click on the green link'
+    error = True
+elif app_doc.passport is None:
     psm = "You must upload your passport picture before you can start the registration process!"
     error = True
@@ -57 +60 @@
                                  ds = ds,
                                  )
+session.set("clicked","clicked")
 pin = str(ds.get('clr_ac_pin'))
 logger.info('"%s", "entered clearance pin", "%s"' % (info['id'],pin))

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -24 +24 @@
 
 if "ClearanceOfficers" in member.getGroups():
-    return redirect("%s/search_students" % students_url)
+    return context.waeup_tool.searchStudents()
+    #return redirect("%s/search_students" % students_url)
 if context.isSectionOfficer():
     return redirect("%s/search_students" % students_url)