[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ - fixed home url lookup

Yvo Schubbe y.2011 at wcm-solutions.de
Wed Feb 16 10:39:27 EST 2011


Log message for revision 120385:
  - fixed home url lookup

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2011-02-16 15:35:06 UTC (rev 120384)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/members.py	2011-02-16 15:39:27 UTC (rev 120385)
@@ -59,11 +59,11 @@
 
     """Utility class wrapping a member for display purposes"""
 
-    def __init__(self, member):
+    def __init__(self, member, mtool):
         login_time = member.getProperty('login_time')
         self.login_time = '2000/01/01' and '---' or login_time.Date()
         self.name = member.getId()
-        self.home = member.getProperty('getHomeUrl')
+        self.home = mtool.getHomeUrl(self.name, verifyPermission=0)
         self.email = member.getProperty('email')
         self.widget = "%s.select" % self.name
 
@@ -127,13 +127,14 @@
         """Create content field objects only for batched items
         Also create pseudo-widget for each item
         """
+        mtool = self._getTool('portal_membership')
         f = IMemberItem['select']
         members = []
         fields = form.FormFields()
         for item in self._getBatchObj():
             field = form.FormField(f, 'select', item.getId())
             fields += form.FormFields(field)
-            members.append(MemberProxy(item))
+            members.append(MemberProxy(item, mtool))
         self.listBatchItems = members
         return fields
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py	2011-02-16 15:35:06 UTC (rev 120384)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_members.py	2011-02-16 15:39:27 UTC (rev 120385)
@@ -53,7 +53,10 @@
     def isAnonymousUser(self):
         return True
 
+    def getHomeUrl(self, id=None, verifyPermission=0):
+        return 'HOME_URL/%s' % id
 
+
 class MembershipViewTests(unittest.TestCase):
 
     def setUp(self):
@@ -93,6 +96,7 @@
         members = view.listBatchItems
         self.assertTrue(isinstance(members[0], MemberProxy))
         self.assertEqual(members[0].name, "Bob")
+        self.assertEqual(members[0].home, "HOME_URL/Bob")
 
     def test_get_ids(self):
         view = Manage(self.site, TestRequest())



More information about the checkins mailing list