Changeset 7652 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

15 Feb 2012, 10:51:53 (13 years ago)

Author:

Henrik Bettermann

Message:

Do not retrieve current principal in derived logging components. This is now done by the parent Logger class.

Location:

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

Files:

• applicant.py (modified) (2 diffs)
• root.py (modified) (2 diffs)
• workflow.py (modified) (2 diffs)

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

@@ -33 +33 @@
     IExtFileStore, IPDF, IUserAccount)
 from waeup.sirp.students.vocabularies import RegNumNotInSource
-from waeup.sirp.utils.helpers import attrs_to_fields, get_current_principal
+from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.applicants.interfaces import IApplicant, IApplicantEdit
 
@@ -314 +314 @@
     comment = 'Applicant record removed'
     target = applicant.applicant_id
-    # In some tests we don't have a principal
     try:
-        user = get_current_principal().id
-    except (TypeError, AttributeError):
-        return
-    try:
-        grok.getSite()['applicants'].logger.info('%s - %s - %s' % (
-            user, target, comment))
+        grok.getSite()['applicants'].logger.info('%s - %s' % (
+            target, comment))
     except KeyError:
         # If we delete an entire university instance there won't be

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

@@ -25 +25 @@
 from waeup.sirp.interfaces import ISIRPPluggable
 from waeup.sirp.applicants.interfaces import IApplicantsRoot
-from waeup.sirp.utils.helpers import get_current_principal
 from waeup.sirp.utils.logger import Logger
 
@@ -42 +41 @@
         """Get the logger's info method.
         """
-        user = get_current_principal()
-        user = getattr(user, 'id', 'system')
-        self.logger.info('%s - %s - %s - %s' % (
-                user, target, ob_class, comment))
+        self.logger.info('%s - %s - %s' % (
+                target, ob_class, comment))
         return
 

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

@@ -24 +24 @@
 from waeup.sirp.interfaces import IObjectHistory, ISIRPWorkflowInfo
 from waeup.sirp.workflow import SIRPWorkflow, SIRPWorkflowInfo
-from waeup.sirp.utils.helpers import get_current_principal
 
 INITIALIZED = 'initialized'
@@ -157 +156 @@
     # 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.applicant_id,msg))
+        applicants_root.logger.info('%s - %s' % (obj.applicant_id,msg))
     except (TypeError, AttributeError):
         pass