Changeset 8974 for main/waeup.kofa/trunk

Timestamp:

11 Jul 2012, 16:36:26 (12 years ago)

Author:

uli

Message:

Tiny code cleanup.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (2 diffs)

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

@@ -1594 +1594 @@
             self.flash(_('Activation code is invalid.'))
             return
+        if code.state == USED:
+            self.flash(_('Activation code has already been used.'))
+            return
         # Mark pin as used (this also fires a pin related transition)
         # and fire transition start_clearance
-        if code.state == USED:
-            self.flash(_('Activation code has already been used.'))
-            return
-        else:
-            comment = _(u"invalidated")
-            # Here we know that the ac is in state initialized so we do not
-            # expect an exception, but the owner might be different
-            if not invalidate_accesscode(pin,comment,self.context.student_id):
-                self.flash(_('You are not the owner of this access code.'))
-                return
-            self.context.clr_code = pin
+        comment = _(u"invalidated")
+        # Here we know that the ac is in state initialized so we do not
+        # expect an exception, but the owner might be different
+        if not invalidate_accesscode(pin, comment, self.context.student_id):
+            self.flash(_('You are not the owner of this access code.'))
+            return
+        self.context.clr_code = pin
         IWorkflowInfo(self.context).fireTransition('start_clearance')
         self.flash(_('Clearance process has been started.'))
@@ -1623 +1622 @@
     def form_fields(self):
         if self.context.is_postgrad:
-            form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
-        else:
-            form_fields = grok.AutoFields(IUGStudentClearance).omit('clearance_locked')
+            form_fields = grok.AutoFields(IPGStudentClearance).omit(
+                'clearance_locked')
+        else:
+            form_fields = grok.AutoFields(IUGStudentClearance).omit(
+                'clearance_locked')
         return form_fields