[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - removed membership tool dependency

[Yvo Schubbe]

Log message for revision 85505:
  - removed membership tool dependency

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Discussions.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-04-20 10:35:34 UTC (rev 85504)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2008-04-20 16:44:45 UTC (rev 85505)
@@ -2,6 +2,9 @@
 
   Products.CMFDefault 2.2.0 (unreleased)
 
+    - DublinCore: Modified the 'addCreator' implementation.
+      It no longer depends on the membership tool.
+
     - DiscussionItem: Removed 'addDiscussionItem' function.
       This was dead code. 'createReply' is used for adding DiscussionItems.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py	2008-04-20 10:35:34 UTC (rev 85504)
+++ Products.CMFDefault/trunk/Products/CMFDefault/DublinCore.py	2008-04-20 16:44:45 UTC (rev 85505)
@@ -16,6 +16,7 @@
 """
 
 from AccessControl import ClassSecurityInfo
+from AccessControl import getSecurityManager
 from Acquisition import aq_base
 from DateTime.DateTime import DateTime
 from Globals import DTMLFile
@@ -98,8 +99,8 @@
         """ Add creator to Dublin Core creators.
         """
         if creator is None:
-            mtool = getToolByName(self, 'portal_membership', None)
-            creator = mtool and mtool.getAuthenticatedMember().getId()
+            user = getSecurityManager().getUser()
+            creator = user and user.getId()
 
         # call self.listCreators() to make sure self.creators exists
         if creator and not creator in self.listCreators():

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Discussions.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Discussions.py	2008-04-20 10:35:34 UTC (rev 85504)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Discussions.py	2008-04-20 16:44:45 UTC (rev 85505)
@@ -18,6 +18,7 @@
 import unittest
 import Testing
 
+from AccessControl.SecurityManagement import newSecurityManager
 from zope.component import getSiteManager
 from zope.interface.verify import verifyClass
 
@@ -26,7 +27,7 @@
 from Products.CMFCore.testing import EventZCMLLayer
 from Products.CMFCore.tests.base.dummy import DummyContent
 from Products.CMFCore.tests.base.dummy import DummySite
-from Products.CMFCore.tests.base.dummy import DummyTool
+from Products.CMFCore.tests.base.dummy import DummyUser
 from Products.CMFCore.tests.base.testcase import SecurityTest
 from Products.CMFCore.tests.base.tidata import FTIDATA_DUMMY
 from Products.CMFCore.tests.base.utils import has_path
@@ -77,11 +78,11 @@
 
     def setUp(self):
         SecurityTest.setUp(self)
+        newSecurityManager(None, DummyUser().__of__(self.app.acl_users))
         self.site = DummySite('site').__of__(self.root)
         sm = getSiteManager()
         self.site._setObject( 'portal_discussion', DiscussionTool() )
         sm.registerUtility(self.site.portal_discussion, IDiscussionTool)
-        self.site._setObject( 'portal_membership', DummyTool() )
         self.site._setObject( 'portal_types', TypesTool() )
 
     def _makeDummyContent(self, id, *args, **kw):