[Erp5-report] r20182 - in /erp5/trunk/products: CMFCategory/CategoryTool.py ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Mar 27 19:04:30 2008
New Revision: 20182

URL: http://svn.erp5.org?rev=20182&view=rev
Log:
* reindex after setting category_list in CMFCategory.

Modified:
    erp5/trunk/products/CMFCategory/CategoryTool.py
    erp5/trunk/products/ERP5Type/Base.py

Modified: erp5/trunk/products/CMFCategory/CategoryTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFCategory/CategoryTool.py?rev=20182&r1=20181&r2=20182&view=diff
==============================================================================
--- erp5/trunk/products/CMFCategory/CategoryTool.py (original)
+++ erp5/trunk/products/CMFCategory/CategoryTool.py Thu Mar 27 19:04:30 2008
@@ -702,7 +702,7 @@
 #           'new_category_list: %s' % str(new_category_list))
 #       LOG("CategoryTool, setCategoryMembership", 0 ,
 #           'default_new_category_list: %s' % str(default_new_category_list))
-      self._setCategoryList(context, tuple(default_new_category_list + new_category_list))
+      self.setCategoryList(context, tuple(default_new_category_list + new_category_list))
 
 
     security.declareProtected( Permissions.AccessContentsInformation, 'setDefaultCategoryMembership' )
@@ -1214,6 +1214,11 @@
           result.append(context.getRelativeUrl()) # Pure category is member of itself
       return result
 
+    security.declareProtected( Permissions.ModifyPortalContent, 'setCategoryList' )
+    def setCategoryList(self, context, value):
+       self._setCategoryList(context, value)
+       context.reindexObject()
+
     security.declareProtected( Permissions.ModifyPortalContent, '_setCategoryList' )
     def _setCategoryList(self, context, value):
        context.categories = tuple(value)
@@ -1253,7 +1258,7 @@
             append(cat)
           else:
             requires_update = 1
-      if requires_update: self._setCategoryList(context, tuple(categories))
+      if requires_update: self.setCategoryList(context, tuple(categories))
 
     # Catalog related methods
     def updateRelatedCategory(self, category, previous_category_url, new_category_url):
@@ -1288,7 +1293,7 @@
                                                       previous_category_url,
                                                       new_category_url)
             category_list.append(new_category)
-          self._setCategoryList(o, category_list)
+          self.setCategoryList(o, category_list)
 
           if getattr(aq_base(o),
                     'notifyAfterUpdateRelatedContent', None) is not None:

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=20182&r1=20181&r2=20182&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Thu Mar 27 19:04:30 2008
@@ -2292,8 +2292,7 @@
 
   security.declareProtected( Permissions.ModifyPortalContent, 'setCategoryList' )
   def setCategoryList(self, path_list):
-    self._setCategoryList(path_list)
-    self.reindexObject()
+    self.portal_categories.setCategoryList(self, path_list)
 
   security.declareProtected( Permissions.ModifyPortalContent, '_setCategoryList' )
   def _setCategoryList(self, path_list):