Changeset 8286 for main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

Timestamp:

26 Apr 2012, 13:58:25 (13 years ago)

Author:

Henrik Bettermann

Message:

Roll back r8282. Also in students the registration state is simply called state.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py (modified) (3 diffs)

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

@@ -759 +759 @@
     @property
     def display_actions(self):
-        app_state = IWorkflowState(self.context).getState()
-        if app_state == INITIALIZED:
+        state = IWorkflowState(self.context).getState()
+        if state == INITIALIZED:
             actions = [[],[]]
-        elif app_state == STARTED:
+        elif state == STARTED:
             actions = [[_('Save')],
                 [_('Add online payment ticket'),_('Remove selected tickets')]]
-        elif app_state == PAID:
+        elif state == PAID:
             actions = [[_('Save'), _('Final Submit')],
                 [_('Remove selected tickets')]]
@@ -773 +773 @@
 
     def unremovable(self, ticket):
-        app_state = IWorkflowState(self.context).getState()
-        return ticket.r_code or app_state in (INITIALIZED, SUBMITTED)
+        state = IWorkflowState(self.context).getState()
+        return ticket.r_code or state in (INITIALIZED, SUBMITTED)
 
     def emit_lock_message(self):
@@ -826 +826 @@
             return
         self.applyData(self.context, **data)
-        app_state = IWorkflowState(self.context).getState()
+        state = IWorkflowState(self.context).getState()
         # This shouldn't happen, but the application officer
         # might have forgotten to lock the form after changing the state
-        if app_state != PAID:
+        if state != PAID:
             self.flash(_('This form cannot be submitted. Wrong state!'))
             return