Changeset 1588

Timestamp:

19 Mar 2007, 12:54:39 (18 years ago)

Author:

Henrik Bettermann

Message:

fixed

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/themes.xml (modified) (1 diff)
• skins/waeup_student/contact_student_form_2.pt (deleted)
• skins/waeup_student/external_contact_student_form.pt (added)
• skins/waeup_student/external_study_level_view.pt (modified) (1 diff)
• skins/waeup_student/reject_courses.py (modified) (2 diffs)
• skins/waeup_student/study_level_view.pt (modified) (1 diff)
• skins/waeup_student/validate_courses.py (modified) (2 diffs)

WAeUP_SRP/trunk/profiles/default/themes.xml

@@ -26 +26 @@
   <element key="course_registration_slip" value="WAeUP_Student+Slippage"/>
   <element key="external_study_level_view" value="WAeUP_Student+Slippage"/>
+  <element key="external_contact_student_form" value="WAeUP_Student+Slippage"/>
  </property>
  <object name="default" meta_type="Portal Theme"/>

WAeUP_SRP/trunk/skins/waeup_student/external_study_level_view.pt

@@ -167 +167 @@
                 <input tal:condition="python: review_state in ('courses_registered', 'courses_validated',)" type="submit" name="reject_courses:method"
                        class="context" value="Reject" />
-                       
-                <input type="hidden" name="action" type="text" id="action"
-                       tal:attributes="value string:/external_study_level_view"/>    
-                <input type="hidden" name="contin" type="text" id="contin"
-                       tal:attributes="value string:/contact_student_form_2"/>                                              
+
+                <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
+                       tal:attributes="value string:external_study_level_view"/>                         
+                <input type="hidden" name="action_after_reject" type="text" id="action_after_reject"
+                       tal:attributes="value string:external_contact_student_form"/>    
+                                           
 
             </td>

WAeUP_SRP/trunk/skins/waeup_student/reject_courses.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=REQUEST, student=None, action=None, contin=None
+##parameters=REQUEST, student=None, action_after_reject=None, action_after_validate=None
 ##title=
 ##
@@ -38 +38 @@
 subject = "Course list rejected"
 args['subject'] = subject
-args['continue'] = contin
+args['continue'] = action_after_validate
 args['portal_status_message'] = psm
-url = context.absolute_url() + action + '?' + urlencode(args)
+url = context.absolute_url() + '/' + action_after_reject + '?' + urlencode(args)
 return REQUEST.RESPONSE.redirect(url)
 

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -175 +175 @@
                        class="context" value="Reject" />
                        
-                <input type="hidden" name="action" type="text" id="action"
-                       tal:attributes="value string:/study_level_view"/>  
-                <input type="hidden" name="contin" type="text" id="contin"
-                       tal:attributes="value string:/contact_student_form"/>                                              
+                <input type="hidden" name="action_after_validate" type="text" id="action_after_validate"
+                       tal:attributes="value string:/study_level_view"/>                         
+                <input type="hidden" name="action_after_reject" type="text" id="action_after_reject"
+                       tal:attributes="value string:/contact_student_form"/>    
+                                             
 
             </td>

WAeUP_SRP/trunk/skins/waeup_student/validate_courses.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=student=None, action=None
+##parameters=student=None, action_after_reject=None, action_after_validate=None
 ##title=
 ##
@@ -32 +32 @@
 
 psm = 'portal_status_message=Course list validated!'
-url = context.absolute_url() + action +  '?' + psm
+url = context.absolute_url() + '/' + action_after_validate +  '?' + psm
 return request.RESPONSE.redirect(url)