Changeset 8758

Timestamp:

19 Jun 2012, 07:47:21 (13 years ago)

Author:

Henrik Bettermann

Message:

Use public_name in object histories and when approving payments.

Location:

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

Files:

• objecthistory.py (modified) (1 diff)
• payments/payment.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)

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

@@ -64 +64 @@
         user = get_current_principal()
         if user is None:
-            user = 'system'
+            usertitle = 'system'
         elif user.id == 'zope.anybody':
-            user = 'Anonymous'
+            usertitle = 'Anonymous'
         else:
-            user = user.title
+            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, user)
+        msg = u'%s - %s %s %s' % (timestamp, msg, by, usertitle)
         msgs.append(msg)
         self._annotations[self.history_key] = msgs

main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

@@ -88 +88 @@
             usertitle = 'system'
         else:
-            usertitle = user.title
+            usertitle = getattr(user, 'public_name', None)
+            if not usertitle:
+                usertitle = user.title
         r_desc = _('Payment approved by ${a}', mapping = {'a': usertitle})
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -900 +900 @@
         self.assertTrue('Student has been cleared' in self.browser.contents)
         self.assertTrue('cleared' in self.browser.contents)
+        self.browser.open(self.history_path)
+        self.assertTrue('Cleared by Carlo Pitter' in self.browser.contents)
+        # Hide real name.
+        self.app['users']['mrclear'].public_name = 'My Public Name'
+        self.browser.open(self.clearance_path)
         self.browser.getLink("Reject clearance").click()
         self.assertTrue('Clearance has been annulled' in self.browser.contents)
@@ -907 +912 @@
             '/contactstudent?subject=%s' % urlmessage)
         self.assertTrue('clearance started' in self.browser.contents)
+        self.browser.open(self.history_path)
+        self.assertTrue("Reset to 'clearance' by My Public Name" in
+            self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('request_clearance')
         self.browser.open(self.clearance_path)