Rewrote getVariationCategoryItemList using getVariationCategoryList for consistency.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@151 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Variated.py

@@ -71,18 +71,22 @@ class Variated(Base):
   def getVariationCategoryItemList(self, base_category_list = (), base=1,
                                         method_id='getTitle', start_with_item=None):
     """
-      Returns the list of possible variations
-    """
-    if base_category_list is ():
-      base_category_list = self.getVariationRangeBaseCategoryList()
+      Returns the list of possible variation items
+    """
+    variation_category_item_list = []
+    if start_with_item is not None:
+      variation_category_item_list.append(start_with_item)
+    variation_category_list = self.getVariationCategoryList(base_category_list=base_category_list)
+    for variation_category in variation_category_list:
+      resource = self.portal_categories.resolveCategory(variation_category)
+      value = getattr(resource, method_id)()
       if base:
-      return map(lambda x:(x.getTitle(),
-         '/'.join(x.getPhysicalPath()[len(x.portal_categories.getPhysicalPath()):])),
-         self._getValueList(base_category_list))
+        label = variation_category
       else:
-      return map(lambda x:(x.getTitle(),
-         '/'.join(x.getPhysicalPath()[1+len(x.portal_categories.getPhysicalPath()):])),
-         self._getValueList(base_category_list))
+        index = variation_category.find('/') + 1
+        label = variation_category[index:]
+      variation_category_item_list.append((label, value))
+    return variation_category_item_list
 
   security.declareProtected(Permissions.ModifyPortalContent, '_setVariationCategoryList')
   def _setVariationCategoryList(self, node_list, base_category_list = ()):
@@ -184,6 +188,9 @@ class Variated(Base):
       clist = [(None,None)]
     return clist
 
+  # Missing methods
+  # getVariationBaseCategoryItemList
+
   # Help
   security.declareProtected(Permissions.AccessContentsInformation,
                                         'getMatrixVariationRangeBaseCategoryList')