Changeset 6383

Timestamp:

16 Jun 2011, 20:38:36 (13 years ago)

Author:

Henrik Bettermann

Message:

accesscodes.invalidate_accesscode(): return false if ac doesn't exist

Use this in browser.py to flash message in addApplicant if ac doesn't exist.

Use a view icon for view tabs.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• accesscodes/accesscodes.py (modified) (1 diff)
• applicants/browser.py (modified) (3 diffs)
• applicants/browser_templates/applicantscontainermanagepage.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscodes.py

@@ -468 +468 @@
     """
     ac = get_access_code(access_code)
-    info = IWorkflowInfo(ac)
-    return _fire_transition(info, 'use')
+    if ac:
+        info = IWorkflowInfo(ac)
+        return _fire_transition(info, 'use')
+    else:
+        False
 
 def disable_accesscode(access_code):

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

@@ -478 +478 @@
         ac_number = self.request.form.get('form.ac_number', None)
         pin = '%s-%s-%s' % (self.ac_prefix,ac_series,ac_number)
-        if pin not in self.context.keys():
+        if not invalidate_accesscode(pin):
+            self.flash('%s is not a valid access code.' % pin)
+            self.redirect(self.url(self.context, '@@manage')+'#tab-2')
+            return
+        else:
             # Create applicant record
             applicant = Applicant()
@@ -647 +651 @@
         return pdf.getpdfdata()
 
-class ApplicantsManageActionButton(ManageActionButton):
+class ApplicantManageActionButton(ManageActionButton):
     grok.context(IApplicant)
     grok.view(DisplayApplicant)
     grok.require('waeup.manageApplications')
-    text = 'Edit application record'
+    text = 'Manage application record'
     target = 'edit_full'
 
@@ -779 +783 @@
 class ApplicantViewActionButton(ManageActionButton):
     grok.context(IApplicant)
-    grok.view(EditApplicantStudent)
-    grok.require('waeup.handleApplication')
+    grok.view(EditApplicantFull)
+    icon = 'actionicon_view.png'
     text = 'View application record'
     target = 'index'

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt

@@ -89 +89 @@
           </tr>
         </tbody>
-      </table>
+      </table><br /><br />
       <div id="actionsView">
         <span class="actionButtons" tal:condition="view/availableActions">