Changeset 6644 for main/waeup.sirp

Timestamp:

28 Aug 2011, 20:05:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Don't add log message when no attribute has been changed, but log all transitions.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/workflow.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/container.py (modified) (2 diffs)
• students/workflow.py (modified) (2 diffs)

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

@@ -762 +762 @@
         self.flash('Form has been saved.')
         ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
-        self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+        if fields_string:
+            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
         return
 

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

@@ -8 +8 @@
 from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.utils.helpers import get_current_principal
 
 INITIALIZED = 'initialized'
@@ -124 +125 @@
     history = IObjectHistory(obj)
     history.addMessage(msg)
+    # In some tests we don't have a an applicants root or a user
+    try:
+        user = get_current_principal()
+        applicants_root = grok.getSite()['applicants']
+        applicants_root.logger.info('%s - %s - %s' % (user.id,obj.access_code,msg))
+    except (TypeError, AttributeError):
+        pass
     return

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

@@ -309 +309 @@
         self.flash('Form has been saved.')
         ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
-        self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+        if fields_string:
+            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/container.py

@@ -58 +58 @@
     logger_filename = 'students.log'
 
-    def logger_info(self, target, ob_class, comment=None):
+    def logger_info(self, ob_class, target, comment=None):
         """Get the logger's info method.
         """
@@ -67 +67 @@
             user = user.id
         self.logger.info('%s - %s - %s - %s' % (
-                user, target, ob_class, comment))
+                user, ob_class, target, comment))
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

@@ -8 +8 @@
 from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
+from waeup.sirp.utils.helpers import get_current_principal
 
 CREATED = 'created'
@@ -59 +60 @@
 @grok.subscribe(IStudent, IWorkflowTransitionEvent)
 def handle_student_transition_event(obj, event):
-    """Append message to student history when transition happened.
+    """Append message to student history and log file when transition happened.
     """
     msg = '%s' % event.transition.user_data['msg']
     history = IObjectHistory(obj)
     history.addMessage(msg)
+    # In some tests we don't have a students container or a user
+    try:
+        user = get_current_principal()
+        students_container = grok.getSite()['students']
+        students_container.logger.info('%s - %s - %s' % (user.id,obj.student_id,msg))
+    except (TypeError, AttributeError):
+        pass
     return