[Erp5-report] r14530 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon May 21 17:15:04 2007
New Revision: 14530

URL: http://svn.erp5.org?rev=14530&view=rev
Log:
explain strict_* generated related keys in docstring
fix LOG message


Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=14530&r1=14529&r2=14530&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py Mon May 21 17:15:04 2007
@@ -49,7 +49,7 @@
 from Products.ERP5Security.ERP5UserManager import SUPER_USER
 
 import os, time, urllib, warnings
-from zLOG import LOG
+from zLOG import LOG, PROBLEM
 
 SECURITY_USING_NUX_USER_GROUPS, SECURITY_USING_PAS = range(2)
 try:
@@ -710,6 +710,10 @@
       For exemple it will generate:
       destination_title | category,catalog/title/z_related_destination
       default_destination_title | category,catalog/title/z_related_destination
+      strict_destination_title | category,catalog/title/z_related_strict_destination
+
+      strict_ related keys only returns documents which are strictly member of
+      the category.
       """
       related_key_list = []
       base_cat_id_list = self.portal_categories.getBaseCategoryDict()
@@ -763,20 +767,18 @@
           (not name.endswith(zope_security))):
           if name.startswith(STRICT_DYNAMIC_METHOD_NAME):
             base_category_id = name[len(STRICT_DYNAMIC_METHOD_NAME):]
-            method = RelatedBaseCategory(base_category_id,strict_membership=1)
+            method = RelatedBaseCategory(base_category_id, strict_membership=1)
           else:
             base_category_id = name[len(DYNAMIC_METHOD_NAME):]
             method = RelatedBaseCategory(base_category_id)
-          setattr(self.__class__, name, 
-                  method)
+          setattr(self.__class__, name, method)
           klass = aq_base(self).__class__
           if hasattr(klass, 'security'):
             from Products.ERP5Type import Permissions as ERP5Permissions
             klass.security.declareProtected(ERP5Permissions.View, name)
           else:
-            # XXX security declaration always failed....
-            LOG('WARNING ERP5Form SelectionTool, security not defined on',
-                0, klass.__name__)
+            LOG('ERP5Catalog', PROBLEM,
+                'Security not defined on %s' % klass.__name__)
           return getattr(self, name)
         else:
           return aq_base_name