Changeset 799

Timestamp:

9 Nov 2006, 07:37:02 (18 years ago)

Author:

Henrik Bettermann

Message:

3rd batch of repairs

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• application_edit.py (modified) (2 diffs)
• check_admission.py (modified) (1 diff)
• layout_application_edit.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/application_edit.py

@@ -30 +30 @@
 app = info['app']
 app_doc = info['app_doc']
-clear = info['clear']
-clear_doc = info['clear_doc']
 state = context.getStudentInfo()['review_state']
 is_valid, ds = app_doc.validate(request=REQUEST,
@@ -56 +54 @@
     if is_valid:
         action = "/start_clearance"
-        base_url = clear.absolute_url()
+        base_url = student.absolute_url()
+        url = base_url + action
+        return REQUEST.RESPONSE.redirect(url)
     else:
         args['portal_status_message'] = 'psm_content_error'

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -25 +25 @@
                       layout_mode='create',
                       formaction = "check_admission",
-                      button = "Check Admission",
+                      button = "Check",
                       )
 if psm == 'invalid':

WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt

@@ -122 +122 @@
          tal:condition="not:creation" />
   <input type="submit" class="standalone" name="proceed"
-         value="apply for admission"
+         value="proceed"
          id="cpsdocument_edit_and_view_button"
          tal:condition="proceed"