Changeset 6367

Timestamp:

14 Jun 2011, 14:06:02 (13 years ago)

Author:

Henrik Bettermann

Message:

Add view permission for applicants to render view and edit buttons correctly.

Reenable transtion 'start' after first login.

Location:

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

Files:

• browser.py (modified) (6 diffs)
• permissions.py (modified) (3 diffs)

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

@@ -422 +422 @@
             return
         pin = self.request.principal.access_code
+        state = IWorkflowState(self.context[pin]).getState()
+        if state == INITIALIZED:
+            IWorkflowInfo(self.context[pin]).fireTransition('start')
         if pin in self.context.keys():
             self.redirect(self.url(self.context[pin], 'edit'))
@@ -443 +446 @@
         role_manager.assignRoleToPrincipal(
             'waeup.PortalUser', self.request.principal.id)
-        # XXX: disable for now. Pins will get a different workflow.
-        #state = IWorkflowState(self.context[pin]).getState()
-        #if state == INITIALIZED:
-        #    IWorkflowInfo(self.context[pin]).fireTransition('start')
         self.redirect(self.url(self.context[pin], 'edit'))
         return
@@ -536 +535 @@
     grok.require('waeup.handleApplication')
     icon = 'actionicon_pdf.png'
-    text = 'Application slip'
+    text = 'Download application slip'
     target = 'application_slip.pdf'
 
@@ -650 +649 @@
     target = 'edit_full'
 
+class ApplicantEditActionButton(ManageActionButton):
+    grok.context(IApplicant)
+    grok.view(DisplayApplicant)
+    grok.require('waeup.handleApplication')
+    text = 'Edit application record'
+    target = 'edit'
+
 class EditApplicantFull(WAeUPEditFormPage):
     """A full edit view for applicant data.
@@ -721 +727 @@
     def update(self):
         if self.context.locked:
-            self.redirect(self.url(self.context))
+            self.emitLockMessage()
             return
         datepicker.need() # Enable jQuery datepicker in date fields.
@@ -766 +772 @@
         return
 
+class ApplicantViewActionButton(ManageActionButton):
+    grok.context(IApplicant)
+    grok.view(EditApplicantStudent)
+    grok.require('waeup.handleApplication')
+    text = 'View application record'
+    target = 'index'

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

@@ -30 +30 @@
     grok.name('waeup.handleApplication')
 
+class ViewApplication(grok.Permission):
+    grok.name('waeup.viewApplication')
+
 class ManageApplications(grok.Permission):
     grok.name('waeup.manageApplications')
@@ -37 +40 @@
     grok.name('waeup.local.ApplicationOwner')
     grok.title(u'Application Owner')
-    grok.permissions('waeup.handleApplication')
+    grok.permissions('waeup.handleApplication', 'waeup.viewApplication')
 
 # Global role
@@ -43 +46 @@
     grok.name('waeup.ApplicationsOfficer')
     grok.title(u'Applications Officer')
-    grok.permissions('waeup.manageApplications', 'waeup.handleApplication')
+    grok.permissions('waeup.manageApplications', 'waeup.viewApplication')