Changeset 1304 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

15 Jan 2007, 22:46:27 (18 years ago)

Author:

Henrik Bettermann

Message:

duplicate workflow transition removed
workflow portlet slightly changed

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getStudentWorkflowInfo.py (modified) (1 diff)
• portlet_student_workflow_display.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py

@@ -28 +28 @@
 info['url'] = student.absolute_url()
 review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
-info['returning'] = review_state in  ('returning',
+info['cr'] = review_state in  ('returning',
                                            'school_fee_paid',
                                            'courses_registered',
                                            'courses_validated',
                                            )
+
 return info

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -3 +3 @@
            condition="context/isStudent">       
 
-<table class="registration" tal:condition="not:info/returning">
+<table class="registration" tal:condition="not:info/cr">
   <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
   <tr><td class="active">
@@ -102 +102 @@
 </table>
 
-<table class="registration" tal:condition="info/returning">
+<table class="registration" tal:condition="info/cr">
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
@@ -108 +108 @@
     Returning
     </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']!='returning'">
-  <tr><td>
-    Returning
   </td></tr>
   </span>