Changeset 1259

Timestamp:

10 Jan 2007, 21:00:33 (18 years ago)

Author:

Henrik Bettermann

Message:

exit transition added

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/workflows/waeup_student_wf/definition.xml (modified) (22 diffs)
• skins/waeup_student/search_students_form.pt (modified) (3 diffs)
• skins/waeup_student/session_results_anon_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml

@@ -147 +147 @@
  <state state_id="objection_raised" title="">
   <exit-transition transition_id="enter_clearance_pin"/>
+  <exit-transition transition_id="create_content"/>
   <permission-map name="Delete objects" acquired="False">
   </permission-map>
@@ -223 +224 @@
              new_state="admitted" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -234 +235 @@
              new_state="admission_applied" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -245 +246 @@
              new_state="cleared_and_validated"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -256 +257 @@
              new_state="student_created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -267 +268 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -279 +280 @@
              new_state="deferred" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -290 +291 @@
              new_state="application_pin_entered"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -301 +302 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -312 +313 @@
              new_state="school_fee_pin_entered"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -322 +323 @@
              new_state="finally_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -333 +334 @@
              new_state="school_fee_pin_entered"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>CourseAdviser</guard-role>
@@ -343 +344 @@
              new_state="pume_failed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -354 +355 @@
              new_state="pume_passed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -365 +366 @@
              new_state="objection_raised" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -377 +378 @@
              new_state="courses_registered" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -387 +388 @@
              new_state="admission_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -398 +399 @@
              new_state="clearance_pin_entered"
              trigger="USER" before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -409 +410 @@
              new_state="clearance_requested" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -420 +421 @@
              new_state="returning" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>SectionOfficer</guard-role>
@@ -430 +431 @@
              new_state="courses_validated" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>CourseAdviser</guard-role>
@@ -442 +443 @@
   <description>Time of the last transition</description>
   <default>
-   
+
    <expression>state_change/getDateTime</expression>
   </default>

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -1 @@
-<metal:html tal:define="rendered options/rendered;
-            portal_status_message options/psm;
-            students options/students;
-            info options/info|nothing;
-            allowed options/allowed|nothing"
-            >
-  <metal:body use-macro="here/main_template/macros/master">
+<metal:body use-macro="here/main_template/macros/master">
     <metal:block fill-slot="header"
                  tal:define="creation creation|nothing;
@@ -13 +7 @@
     </metal:block>
     
-    <metal:main fill-slot="main">
+    <metal:main fill-slot="main"
+            tal:define="rendered options/rendered;
+            portal_status_message options/psm;
+            students options/students;
+            info options/info|nothing;
+            allowed options/allowed|nothing"
+            >
       <span tal:condition="not: allowed">
         <span tal:content="here/illegal_view" />
@@ -122 +122 @@
       </span>
     </metal:main>
-  </metal:body>
-</metal:html>
+</metal:body>
   

WAeUP_SRP/trunk/skins/waeup_student/session_results_anon_view.pt

@@ -56 +56 @@
       <div tal:condition="registered">
         <span tal:condition="python: registered == 'no_student_object'">
-          Your student and member record have not yet been created, please check again later.
+          Your student and member records have not yet been created, please check again later.
         </span>
         <font color="red">