Changeset 7370

Timestamp:

18 Dec 2011, 10:41:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Log applicant_id not access_code.

Histories should contain real names not user ids.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/workflow.py (modified) (1 diff)
• objecthistory.py (modified) (1 diff)

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

@@ -22 +22 @@
 import grok
 from time import time
-from datetime import datetime
+from datetime import datetime, date
 from zope.component import getUtility, createObject
 from zope.formlib.form import setUpEditWidgets

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

@@ -159 +159 @@
         user = get_current_principal()
         applicants_root = grok.getSite()['applicants']
-        applicants_root.logger.info('%s - %s - %s' % (user.id,obj.access_code,msg))
+        applicants_root.logger.info('%s - %s - %s' % (user.id,obj.applicant_id,msg))
     except (TypeError, AttributeError):
         pass

main/waeup.sirp/trunk/src/waeup/sirp/objecthistory.py

@@ -58 +58 @@
         timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         user = get_current_principal()
+        import pdb; pdb.set_trace()
         if user is None:
             user = 'system'
-        elif user.title == 'Applicant':
-            user = 'applicant'
+        elif user.id == 'zope.anybody':
+            user = 'Anonymous'
         else:
-            user = user.id
+            user = user.title
         msg = '%s - %s by %s' % (timestamp, msg, user)
         msgs.append(msg)