Changeset 7996

Timestamp:

28 Mar 2012, 16:32:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Add correct applicant object when using the ApplicantRegistrationPage?.

Harmonize workflow transition messages.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/browser_templates/applicanteditpage.pt (modified) (1 diff)
• students/workflow.py (modified) (10 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -835 +835 @@
         return
 
-    @action(_('Save'))
+    @action(_('Save'), style='primary')
     def save(self, **data):
         if self.passport_changed is False:  # False is not None!
@@ -922 +922 @@
             return
         # Add applicant and create password
-        applicant = createObject('waeup.Applicant')
+        applicant = createObject(self.context.factory_name)
         self.applyData(applicant, **data)
         self.context.addApplicant(applicant)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt

@@ -62 +62 @@
     </span>
   </div>
+  <br />
 
   <div tal:condition="view/availableActions">

main/waeup.kofa/trunk/src/waeup/kofa/students/workflow.py

@@ -36 +36 @@
         transition_id = 'reset1',
         title = _('Reset student'),
-        msg = _('Student record reset'),
+        msg = _('Reset to initial state'),
         source = ADMITTED,
         destination = CREATED),
@@ -50 +50 @@
         transition_id = 'reset2',
         title = _('Reset to admitted'),
-        msg = _("Student record reset to 'admitted'"),
+        msg = _("Reset to 'admitted'"),
         source = CLEARANCE,
         destination = ADMITTED),
@@ -64 +64 @@
         transition_id = 'reset3',
         title = _('Reset to clearance'),
-        msg = _("Student record reset to 'clearance'"),
+        msg = _("Reset to 'clearance'"),
         source = REQUESTED,
         destination = CLEARANCE),
@@ -78 +78 @@
         transition_id = 'reset4',
         title = _('Reset to clearance'),
-        msg = _("Student record reset to 'clearance'"),
+        msg = _("Reset to 'clearance'"),
         source = CLEARED,
         destination = CLEARANCE),
@@ -92 +92 @@
         transition_id = 'reset5',
         title = _('Reset to cleared'),
-        msg = _("Student record reset to 'cleared'"),
+        msg = _("Reset to 'cleared'"),
         source = PAID,
         destination = CLEARED),
@@ -106 +106 @@
         transition_id = 'reset6',
         title = _('Reset to returning'),
-        msg = _("Student record reset to 'returning'"),
+        msg = _("Reset to 'returning'"),
         source = PAID,
         destination = RETURNING),
@@ -120 +120 @@
         transition_id = 'reset7',
         title = _('Reset to paid'),
-        msg = _("Student record reset to 'paid'"),
+        msg = _("Reset to 'paid'"),
         source = REGISTERED,
         destination = PAID),
@@ -134 +134 @@
         transition_id = 'reset8',
         title = _('Reset to paid'),
-        msg = _("Student record reset to 'paid'"),
+        msg = _("Reset to 'paid'"),
         source = VALIDATED,
         destination = PAID),
@@ -141 +141 @@
         transition_id = 'return',
         title = _('Return'),
-        msg = _('Returned'),
+        msg = _("Reset to 'returning'"),
         source = VALIDATED,
         destination = RETURNING),
@@ -148 +148 @@
         transition_id = 'reset9',
         title = _('Reset to validated'),
-        msg = _("Student record reset to 'validated'"),
+        msg = _("Reset to 'validated'"),
         source = RETURNING,
         destination = VALIDATED),