Changeset 11070

Timestamp:

11 Feb 2014, 08:52:38 (11 years ago)

Author:

Henrik Bettermann

Message:

Merge with previous revision in trunk.

Location:

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

Files:

• . (modified) (1 prop)
• objecthistory.py (modified) (1 diff)

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/objecthistory.py

@@ -53 +53 @@
         return self._getMessages()
 
-    def addMessage(self, msg):
+    def addMessage(self, msg, user=None):
         """Add the message (history entry) in msg.
 
         Any message will be stored with a timestamp and the current
-        user (principal).
+        user (principal) if user parameter is None.
         """
         msgs = self._getMessages()
         tz = getUtility(IKofaUtils).tzinfo
         timestamp = now(tz).strftime("%Y-%m-%d %H:%M:%S %Z")
-        user = get_current_principal()
-        if user is None:
-            usertitle = 'system'
-        elif user.id == 'zope.anybody':
-            usertitle = 'Anonymous'
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        msg = translate(msg,'waeup.kofa',target_language=portal_language)
+        by = translate(_('by'),'waeup.kofa',target_language=portal_language)
+        if user == None:
+            user = get_current_principal()
+            if user is None:
+                usertitle = 'system'
+            elif user.id == 'zope.anybody':
+                usertitle = 'Anonymous'
+            else:
+                usertitle = getattr(user, 'public_name', None)
+                if not usertitle:
+                    usertitle = user.title
+            msg = u'%s - %s %s %s' % (timestamp, msg, by, usertitle)
+        elif user == 'undisclosed':
+            msg = u'%s - %s' % (timestamp, msg)
         else:
-            usertitle = getattr(user, 'public_name', None)
-            if not usertitle:
-                usertitle = user.title
-        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        by = translate(_('by'),'waeup.kofa',target_language=portal_language)
-        msg = translate(msg,'waeup.kofa',target_language=portal_language)
-        msg = u'%s - %s %s %s' % (timestamp, msg, by, usertitle)
+            msg = u'%s - %s %s %s' % (timestamp, msg, by, user)
         msgs.append(msg)
         self._annotations[self.history_key] = msgs