Changeset 8335 for main

Timestamp:

3 May 2012, 20:53:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Move initial workflow transition to handle_applicant_added. This way we can avoid misleading duplicate log entries.

Roll back changes in workflow.py.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/applicant.py (modified) (2 diffs)
• applicants/tests/test_batching.py (modified) (1 diff)
• applicants/workflow.py (modified) (1 diff)
• utils/converters.py (modified) (1 diff)

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

@@ -45 +45 @@
         super(Applicant, self).__init__()
         self.password = None
-        IWorkflowInfo(self).fireTransition('init')
         self.application_date = None
         self.applicant_id = None
@@ -307 +306 @@
     role_manager.assignRoleToPrincipal(
         'waeup.Applicant', applicant.applicant_id)
+    IWorkflowInfo(applicant).fireTransition('init')
 
     # Assign global applicant role for new applicant (alternative way)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -307 +307 @@
             'date_of_birth=1990-01-04, email=xx@yy.zz' in
             logcontent)
+        # Logging message from handle_applicant_transition_event
+        self.assertTrue(
+            'dp2011_1234 - Application initialized' in
+            logcontent)
         shutil.rmtree(os.path.dirname(fin_file))
 

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

@@ -170 +170 @@
     history.addMessage(msg)
     # In some tests we don't have a an applicants root or a user
-    if event.transition.transition_id != 'init':
-        try:
-            applicants_root = grok.getSite()['applicants']
-            applicants_root.logger.info('%s - %s' % (obj.applicant_id,msg))
-        except (TypeError, AttributeError):
-            pass
+    try:
+        applicants_root = grok.getSite()['applicants']
+        applicants_root.logger.info('%s - %s' % (obj.applicant_id,msg))
+    except (TypeError, AttributeError):
+        pass
     return

main/waeup.kofa/trunk/src/waeup/kofa/utils/converters.py

@@ -302 +302 @@
         obj = context
         if isinstance(context, basestring):
-            # If we log initialization transitions this
-            # will create another (misleading) log entry
+            # If we log initialization transitions in the __init__
+            # method of objects, a second (misleading) log entry
+            # will be created here.
             obj = createObject(context)