[Erp5-report] r16567 - in /erp5/trunk/products/CMFCategory: ./ tests/

[nobody at svn.erp5.org]

Author: romain
Date: Mon Sep 24 10:20:29 2007
New Revision: 16567

URL: http://svn.erp5.org?rev=16567&view=rev
Log:
Revision 16551 changes the behaviour of parent acquisition.
Acquisition should happen only when parent portal type is defined.

Modified:
    erp5/trunk/products/CMFCategory/CategoryTool.py
    erp5/trunk/products/CMFCategory/tests/testCMFCategory.py

Modified: erp5/trunk/products/CMFCategory/CategoryTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/CategoryTool.py?rev=16567&r1=16566&r2=16567&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/CategoryTool.py (original)
+++ erp5/trunk/products/CMFCategory/CategoryTool.py Mon Sep 24 10:20:29 2007
@@ -781,7 +781,7 @@
       #LOG('getSingleCategoryMembershipList', 0, 'base_category = %s, spec = %s, base = %s, context = %s, context.aq_inner.aq_parent = %s' % (repr(base_category), repr(spec), repr(base), repr(context), repr(context.aq_inner.aq_parent)))
       if base_category == 'parent':
         parent = context.aq_inner.aq_parent # aq_inner is required to make sure we use containment
-        if not spec or parent.portal_type in spec:
+        if parent.portal_type in spec:
           parent_relative_url = parent.getRelativeUrl()
           if (checked_permission is None) or \
             (permissionFilter(parent_relative_url) is not None):

Modified: erp5/trunk/products/CMFCategory/tests/testCMFCategory.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/tests/testCMFCategory.py?rev=16567&r1=16566&r2=16567&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/tests/testCMFCategory.py (original)
+++ erp5/trunk/products/CMFCategory/tests/testCMFCategory.py Mon Sep 24 10:20:29 2007
@@ -934,26 +934,41 @@
     obj = self.portal.person_module.newContent(portal_type='Person')
     parent_url = self.portal.person_module.getRelativeUrl()
 
-    self.assertEquals([parent_url],
+    self.assertEquals([],
           pc.getSingleCategoryMembershipList(obj, 'parent'))
 
     self.assertEquals([parent_url],
           pc.getSingleCategoryMembershipList(obj, 'parent',
                         portal_type='Person Module'))
+
     self.assertEquals([],
           pc.getSingleCategoryMembershipList(obj, 'parent',
                         portal_type='Organisation'))
 
+    self.assertEquals([],
+          pc.getSingleCategoryMembershipList(obj, 'parent', base=1))
+
     self.assertEquals(['parent/%s' % parent_url],
-          pc.getSingleCategoryMembershipList(obj, 'parent', base=1))
+          pc.getSingleCategoryMembershipList(obj, 'parent', base=1,
+                        portal_type='Person Module'))
+
+    self.assertEquals([],
+          pc.getSingleCategoryMembershipList(obj, 'parent',
+                                checked_permission='View'))
 
     self.assertEquals([parent_url],
           pc.getSingleCategoryMembershipList(obj, 'parent',
-                                checked_permission='View'))
+                                checked_permission='View',
+                                portal_type='Person Module'))
+
     noSecurityManager()
     self.assertEquals([],
           pc.getSingleCategoryMembershipList(obj, 'parent',
                                 checked_permission='Manage portal'))
+    self.assertEquals([],
+          pc.getSingleCategoryMembershipList(obj, 'parent',
+                                checked_permission='Manage portal',
+                                portal_type='Person Module'))
 
 
 def test_suite():