method_id migrated to display_id

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

product/ERP5/Document/Amount.py

@@ -120,16 +120,16 @@ class Amount(Base, Variated):
   security.declareProtected(Permissions.AccessContentsInformation,
                                                 'getVariationRangeCategoryItemList')
   def getVariationRangeCategoryItemList(self, base_category_list = (),
-                                        method_id='getTitle', base=1,  start_with_item=None):
+                                        display_id='getTitle', base=1,  current_category=None):
     """
       Returns possible category items for this amount ie.
       the variation of the resource (not the variation range)
     """
     try:
       return self.getDefaultResourceValue().getVariationCategoryItemList(
-               base_category_list, method_id=method_id, base=base, start_with_item=start_with_item)
+               base_category_list, display_id=display_id, base=base, current_category=current_category)
     except:
-      # FIXME: method_name vs. method_id, start_with_item vs. start_with_empty, etc. -yo
+      # FIXME: method_name vs. method_id, current_category vs. start_with_empty, etc. -yo
       return self.portal_categories.getCategoryChildItemList()
 
   security.declareProtected(Permissions.AccessContentsInformation,

product/ERP5/Document/AssortedResource.py

@@ -272,7 +272,7 @@ identify a bank account."""
       return sorted_list
 
     # Update the range of cells according to the currently selected base categories.
-    def _updateCellRange(self, base=1, start_with_item=None):
+    def _updateCellRange(self, base=1, current_category=None):
       transformation = self.aq_parent
       kwd = {'base_id': 'quantity'}
       kw = []
@@ -358,7 +358,7 @@ identify a bank account."""
 
     # Methods for matrix UI widgets
     security.declareProtected(Permissions.AccessContentsInformation, 'getQLineItemList')
-    def getQLineItemList(self, method_id='getTitle', base=1, start_with_item=None):
+    def getQLineItemList(self, display_id='getTitle', base=1, current_category=None):
       """
       """
       line_category = self._getSortedBaseCategoryList(self.getQVariationBaseCategoryList())[0]
@@ -367,14 +367,14 @@ identify a bank account."""
         result = [(None,'')]
       else:
         result = self.getVariationRangeCategoryItemList(base_category_list = [line_category],
-                                                        method_id=method_id,
+                                                        display_id=display_id,
                                                         base=base,
-                                                        start_with_item=start_with_item)
+                                                        current_category=current_category)
       #LOG('getQLineItemList', 10, "%s" % str(result))
       return result
 
     security.declareProtected(Permissions.AccessContentsInformation, 'getQColumnItemList')
-    def getQColumnItemList(self, method_id='getTitle', base=1, start_with_item=None):
+    def getQColumnItemList(self, display_id='getTitle', base=1, current_category=None):
       """
       """
       column_category = self._getSortedBaseCategoryList(self.getQVariationBaseCategoryList())[1]
@@ -383,14 +383,14 @@ identify a bank account."""
         result = [(None,'')]
       else:
         result = self.getVariationRangeCategoryItemList(base_category_list = [column_category],
-                                                        method_id=method_id,
+                                                        display_id=display_id,
                                                         base=base,
-                                                        start_with_item=start_with_item)
+                                                        current_category=current_category)
       #LOG('getQColumnItemList', 0, "%s" % str(result))
       return result
 
     security.declareProtected(Permissions.AccessContentsInformation, 'getQTabItemList')
-    def getQTabItemList(self, method_id='getTitle', base=1, start_with_item=None):
+    def getQTabItemList(self, display_id='getTitle', base=1, current_category=None):
       """
         Returns a list of items which can be used as index for
         each tab of a matrix or to define a cell range.
@@ -399,15 +399,15 @@ identify a bank account."""
       tab_category_item_list_list = []
       for tab_category in tab_category_list:
         tab_category_item_list = self.getVariationRangeCategoryItemList(base_category_list = [tab_category],
-                                                                        method_id=method_id,
+                                                                        display_id=display_id,
                                                                         base=base,
-                                                                        start_with_item=start_with_item)
+                                                                        current_category=current_category)
         tab_category_item_list_list.append(tab_category_item_list)
       transformation = self.aq_parent
       transformation_category_item_list = transformation.getVariationCategoryItemList(
                                                           method_id=method_id,
                                                           base=base,
-                                                          start_with_item=start_with_item)
+                                                          current_category=current_category)
       tab_category_item_list_list.append(transformation_category_item_list)
       if len(tab_category_item_list_list) > 0:
         product_list = cartesianProduct(tab_category_item_list_list)

product/ERP5/Document/Resource.py

@@ -117,7 +117,7 @@ a service in a public administration)."""
     security.declareProtected(Permissions.AccessContentsInformation,
                                            'getVariationRangeCategoryItemList')
     def getVariationRangeCategoryItemList(self, base_category_list = (), base=1, root=1,
-                                                method_id='getTitle', current_category=None):
+                                                display_id='getTitle', current_category=None):
         """
           Returns possible variations
         """
@@ -152,12 +152,12 @@ a service in a public administration)."""
     security.declareProtected(Permissions.AccessContentsInformation,
                                            'getVariationCategoryItemList')
     def getVariationCategoryItemList(self, base_category_list = (),  base=1,
-                                        method_id='getTitle',current_category=None):
+                                        display_id='getTitle',current_category=None):
         """
           Returns possible variations
         """
         result = Variated.getVariationCategoryItemList(self, base_category_list = base_category_list,
-                                          method_id=method_id, base = base, current_category=None)
+                                          display_id=display_id, base = base, current_category=None)
         try:
           other_variations = self.searchFolder(portal_type = variation_type_list)
         except:

product/ERP5/Interface/Variated.py

@@ -126,9 +126,9 @@ class Variated(Interface):
         pass
 
     def getVariationRangeCategoryItemList(self, base_category_list = (),
-                              method_id='getTitle', base=1,  current_category=None):
+                              display_id='getTitle', base=1,  current_category=None):
         """
-            returns a list of (category.id, category.method_id()) which are acceptable
+            returns a list of (category.id, category.display_id()) which are acceptable
             as discrete variation values
         """
         pass
@@ -141,7 +141,7 @@ class Variated(Interface):
         pass
 
     def getVariationRangeBaseCategoryItemList(self, base_category_list = (),
-                              method_id='getTitle', base=1,  current_category=None):
+                              display_id='getTitle', base=1,  current_category=None):
         """
             returns a list of base category items which are acceptable
             as discrete variation values

product/ERP5/Variated.py

@@ -71,17 +71,17 @@ class Variated(Base):
 
   security.declareProtected(Permissions.AccessContentsInformation, 'getVariationCategoryItemList')
   def getVariationCategoryItemList(self, base_category_list = (), base=1,
-                                        method_id='getTitle', start_with_item=None):
+                                        display_id='getTitle', current_category=None):
     """
       Returns the list of possible variations
     """
     variation_category_item_list = []
-    if start_with_item is not None:
-      variation_category_item_list.append(start_with_item)
+    if current_category is not None:
+      variation_category_item_list.append((current_category,current_category))
     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)()
+      value = getattr(resource, display_id)()
       if base:
         label = variation_category
       else:
@@ -129,7 +129,7 @@ class Variated(Base):
 
   security.declareProtected(Permissions.AccessContentsInformation,
                                     'getVariationRangeBaseCategoryItemList')
-  def getVariationRangeBaseCategoryItemList(self, base=1, method_id='getTitle', start_with_item=None):
+  def getVariationRangeBaseCategoryItemList(self, base=1, display_id='getTitle', current_category=None):
       """
         Returns possible variations of the resource
         as a list of tuples (id, title). This is mostly