[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - show fullname if available

[Yvo Schubbe]

Log message for revision 122431:
  - show fullname if available

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_form.py
  UU  Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_template.pt

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2011-07-30 09:00:03 UTC (rev 122430)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2011-07-30 09:32:41 UTC (rev 122431)
@@ -60,13 +60,15 @@
     """Utility class wrapping a member for display purposes"""
 
     def __init__(self, member, mtool):
+        member_id = member.getId()
+        fullname = member.getProperty('fullname')
         last_login = member.getProperty('login_time')
         never_logged_in = str(last_login).startswith('2000/01/01')
         self.login_time = never_logged_in and '---' or last_login.Date()
-        self.name = member.getId()
-        self.home = mtool.getHomeUrl(self.name, verifyPermission=0)
+        self.name = '%s (%s)' % (fullname, member_id)
+        self.home = mtool.getHomeUrl(member_id, verifyPermission=0)
         self.email = member.getProperty('email')
-        self.widget = "%s.select" % self.name
+        self.widget = "%s.select" % member_id
 
 
 class Manage(BatchViewBase, EditFormBase):

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py	2011-07-30 09:00:03 UTC (rev 122430)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py	2011-07-30 09:32:41 UTC (rev 122431)
@@ -35,6 +35,8 @@
     def getProperty(self, attr):
         if attr == 'login_time':
             return DateTime('2000/01/01 00:00:00')
+        elif attr == 'fullname':
+            return 'FULL NAME'
         return None
 
 
@@ -98,7 +100,7 @@
         view.member_fields()
         members = view.listBatchItems
         self.assertTrue(isinstance(members[0], MemberProxy))
-        self.assertEqual(members[0].name, "Bob")
+        self.assertEqual(members[0].name, 'FULL NAME (Bob)')
         self.assertEqual(members[0].home, "HOME_URL/Bob")
 
     def test_get_ids(self):

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_form.py	2011-07-30 09:00:03 UTC (rev 122430)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_form.py	2011-07-30 09:32:41 UTC (rev 122431)
@@ -30,6 +30,7 @@
 items = []
 for member in batch_obj:
     member_id = member.getId()
+    fullname = member.getProperty('fullname')
     last_login = member.getProperty('login_time')
     never_logged_in = str(last_login).startswith('2000/01/01')
     member_login = never_logged_in and '---' or last_login.Date()
@@ -38,6 +39,7 @@
                    'email': member.getProperty('email'),
                    'login': member_login,
                    'id': member_id,
+                   'name': '%s (%s)' % (fullname, member_id),
                    'home': member_home } )
 navigation = context.getBatchNavigation(batch_obj, target,
                                         'member', 'members')

Modified: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_template.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_template.pt	2011-07-30 09:00:03 UTC (rev 122430)
+++ Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_template.pt	2011-07-30 09:32:41 UTC (rev 122431)
@@ -16,7 +16,7 @@
   <thead>
    <tr class="list-header">
     <td width="20">&nbsp;</td>
-    <th width="120" i18n:translate="">Member</th>
+    <th width="260" i18n:translate="">Member</th>
     <th width="260" i18n:translate="">Email Address</th>
     <th width="100" i18n:translate="">Last Login</th>
    </tr>
@@ -31,7 +31,7 @@
     <td
     ><a href="" tal:attributes="href member/home"
         tal:omit-tag="not:member/home"
-        tal:content="member/id">ID</a></td>
+        tal:content="member/name">NAME (ID)</a></td>
     <td
     ><a href="" tal:attributes="href string:mailto:${member/email}"
         tal:omit-tag="not:member/email"


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/skins/zpt_generic/members_manage_template.pt
___________________________________________________________________
Deleted: svn:keywords
   - Author Date Id Revision