Changeset 2160 for WAeUP_SRP/trunk

Timestamp:

24 Aug 2007, 09:47:46 (17 years ago)

Author:

Henrik Bettermann

Message:

assume role also in state 'entered'

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• apply_pume.py (modified) (8 diffs)
• apply_pume_manage.py (modified) (2 diffs)
• apply_pume_manage_form.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

@@ -44 +44 @@
     else:
         mode = "create"
-validate = create or edit or apply_pume or manage
+validate = create or edit or apply_pume
+
+if manage:
+    validate = False
 
 lt = context.portal_layouts
@@ -58 +61 @@
             object[field] = getattr(brains[0],field,None)
         if not object['passport']:
-            object['passport'] = ''
+                object['passport'] = ''
         if object['status'] == "submitted":
             submitted = True
@@ -67 +70 @@
     mode = "view_slip"
     logger.info('%s/%s views application slip' % (member,reg_no))
+
 res,psm,ds = lt.renderLayout(layout_id= 'application',
                              schema_id= 'application',
@@ -91 +95 @@
                                    ds = ds,
                                   )
-elif psm == '':
+elif psm == '' and not manage:
     return context.apply_pume_form(rendered = res,
                                    psm = None,
@@ -97 +101 @@
                                    mode = mode,
                                   )
-elif psm == 'valid':
+elif psm == 'valid' or (psm == '' and manage):
     pass
 data = {}
@@ -105 +109 @@
         data[field] = dm.get(field)
 data['reg_no'] = reg_no
+
+
+
 if apply_pume:
     if submitted:
@@ -193 +200 @@
         logger.info('%s/%s entered application record' % (member,reg_no))
 
-   
+
+try:   
+    passport_uploaded = bool(data['passport'])
+except:
+    passport_uploaded = False
 
 return context.apply_pume_form(rendered = res,
@@ -199 +210 @@
                             #psm = "%s, %s" % (psm,ds),
                             mode = mode,
-                            show_submit =  bool(data['passport']),
+                            show_submit = passport_uploaded,
                             ds = ds,
                             )

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_manage.py

@@ -1 @@
-## Script (Python) "apply_pume"
+## Script (Python) "apply_pume_manage"
 ##bind container=container
 ##bind context=context
@@ -39 +39 @@
 lt = context.portal_layouts
 
-reg_no = request.get('reg_no','')
-new_reg_no = request.get('new_reg_no','')
+reg_no = request.get('reg_no','').upper()
+new_reg_no = request.get('new_reg_no','').upper()
 
 if reset:

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_manage_form.pt

@@ -71 +71 @@
             enctype="multipart/form-data" class="workflow"
             tal:attributes="action string:${context/absolute_url}/apply_pume"
+            tal:condition="rendered_main"
             >
         <input type="hidden" name="reg_no"
@@ -78 +79 @@
                class="standalone" 
                name="manage"
-               value="Assume the Applicant's Role"
+               value="Assume Applicant's Role"
                />             
         </form>