Changeset 5506

Timestamp:

28 Aug 2010, 06:38:12 (14 years ago)

Author:

Henrik Bettermann

Message:

logged_in.py: do not fill app_mobile after first_time_login

apply_admission_manage.py: hand over reg_no after psm == 'invalid'

clean application_edit_form.pt

Location:

WAeUP_SRP/trunk/skins

Files:

• cps_custom/logged_in.py (modified) (1 diff)
• waeup_student/application_edit_form.pt (modified) (1 diff)
• waeup_student/apply_admission_manage.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/cps_custom/logged_in.py

@@ -110 +110 @@
             phone=request.get("phone_nr")
             # should be always closed, however ...
-            if a_review_state != 'opened':
-                wftool.doActionFor(student_app,'open')
+            #if a_review_state != 'opened':
+            #    wftool.doActionFor(student_app,'open')
             # should be always opened after import, however ...
             if p_review_state != 'opened':
                 wftool.doActionFor(student_per,'open')
             per_doc = student_per.getContent()
-            app_doc.edit(mapping = {'app_email' : email})
+            #app_doc.edit(mapping = {'app_email' : email})
             per_doc.edit(mapping = {'email' : email, 'phone' : phone})
-            wftool.doActionFor(student_app,'close')
+            #wftool.doActionFor(student_app,'close')
 
         #########################################################

WAeUP_SRP/trunk/skins/waeup_student/application_edit_form.pt

@@ -12 +12 @@
            form_action string:application_edit;
            edition python:True;
-           app_email info/app_doc/app_email|nothing;
-           app_passport info/has_passport;
-           data_complete python:app_passport and app_email;
            metadata nothing;
             ">

WAeUP_SRP/trunk/skins/waeup_student/apply_admission_manage.py

@@ -78 +78 @@
     return context.apply_admission_manage_form(rendered = res,
                                    psm = "Please correct your input!",
+                                   reg_no = reg_no,
                                    #psm = "%s, %s" % (psm,ds),
                                    ds = ds,