Changeset 6377 for main/waeup.sirp/trunk/src/waeup

Timestamp:

16 Jun 2011, 09:53:26 (13 years ago)

Author:

uli

Message:

Reenable application start workflow on login.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py (modified) (2 diffs)

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

@@ -421 +421 @@
             # Don't care if user is already authenticated as non-applicant
             return
+
+        # From here we handle an applicant (not an officer browsing)
         pin = self.request.principal.access_code
 
@@ -426 +428 @@
         invalidate_accesscode(pin)
 
-        if pin in self.context.keys():
-            self.redirect(self.url(self.context[pin], 'edit'))
-            return
-
-        # Create applicant record
-        applicant = Applicant()
-        applicant.access_code = pin
-        self.context[pin] = applicant
-
-        # Assign current principal the owner role on created applicant
-        # record
+        if not pin in self.context.keys():
+            # Create applicant record
+            applicant = Applicant()
+            applicant.access_code = pin
+            self.context[pin] = applicant
+
         role_manager = IPrincipalRoleManager(self.context[pin])
-        role_manager.assignRoleToPrincipal(
-            'waeup.local.ApplicationOwner', self.request.principal.id)
-        # Assign current principal the PortalUser role
-        role_manager = IPrincipalRoleManager(grok.getSite()['faculties'])
-        role_manager.assignRoleToPrincipal(
-            'waeup.PortalUser', self.request.principal.id)
+        roles = role_manager.getRolesForPrincipal(self.request.principal.id)
+        if not 'waeup.local.ApplicationOwner' in map(lambda x, y: x, roles):
+            # Assign current principal the owner role on created applicant
+            # record
+            role_manager.assignRoleToPrincipal(
+                'waeup.local.ApplicationOwner', self.request.principal.id)
+
+            # Assign current principal the PortalUser role
+            role_manager = IPrincipalRoleManager(grok.getSite()['faculties'])
+            role_manager.assignRoleToPrincipal(
+                'waeup.PortalUser', self.request.principal.id)
+
+        # Mark application as started
+        if IWorkflowState(self.context[pin]).getState() is INITIALIZED:
+            IWorkflowInfo(self.context[pin]).fireTransition('start')
+
         self.redirect(self.url(self.context[pin], 'edit'))
         return