Changeset 539 for WAeUP_SRP/trunk

Timestamp:

20 Sep 2006, 10:38:05 (18 years ago)

Author:

joachim

Message:

fixed #21

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (1 diff)
• profiles/default/roots.xml (modified) (1 diff)
• skins/waeup_student/student_edit.py (modified) (4 diffs)

WAeUP_SRP/trunk/Students.py

@@ -350 +350 @@
             app_doc = app.getContent()
             app_doc.edit(mapping=da)
-            wftool.doActionFor(app,'open',dest_container=app)
+            #wftool.doActionFor(app,'open',dest_container=app)
             app.manage_setLocalRoles(sid, ['Owner',])
             student.getContent().createSubObjects()

WAeUP_SRP/trunk/profiles/default/roots.xml

@@ -4 +4 @@
  <script script_id=".cpsskins_theme"
          type="Script (Python)" 
-         filename="roots/.cpsskins_theme.py"
-         />
+        />
 </roots>

WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

@@ -20 +20 @@
 form in the session.
 """
-
+wftool = context.portal_workflow
 from urllib import urlencode
 from Products.CPSDocument.utils import getFormUidUrlArg
@@ -50 +50 @@
                                     use_session=True)
     
-        action = "/student_edit"
-        if is_valid:
+        action = "/passport_entry_view"
+        if is_valid and app_doc.passport is not None:
             psm = 'You successfully uploaded your passport image.'
+            args = {'apply_button': 'Save and Apply',}
+        else:
+            psm = "You didn't upload a passport image."
             args = {}
-        else:
-            psm = 'psm_content_error'
-            args = getFormUidUrlArg(REQUEST)
     elif 'apply_admission' not in REQUEST.form:
         is_valid, ds = app_doc.validate(request=REQUEST,
@@ -73 +73 @@
         else:
             args = getFormUidUrlArg(REQUEST)
-            #psm = 'psm_content_error'
-            psm = '%s' % ds
+            psm = 'psm_content_error'
     else:
         args = {}
+        wftool.doActionFor(app,'close',dest_container= app)
         psm = 'You applied for admission.'
         action = "/application_view"
@@ -96 +96 @@
         args = {}
     else:
-        info['app'].content_status_modify(workflow_action="close")
         psm = 'psm_content_error'
         args = getFormUidUrlArg(REQUEST)