we should be able to specify if we want to display a category if there is sub-categories

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

product/CMFCategory/Category.py

@@ -170,7 +170,7 @@ class Category(Folder):
 
     security.declareProtected(Permissions.AccessContentsInformation,
                                                     'getCategoryChildValueList')
-    def getCategoryChildValueList(self, recursive=1):
+    def getCategoryChildValueList(self, recursive=1,**kw):
       """
           List the child objects of this category and all its subcategories.
 
@@ -493,11 +493,24 @@ class BaseCategory(Category):
 
     security.declareProtected(Permissions.AccessContentsInformation,
                                                     'getCategoryChildValueList')
-    def getCategoryChildValueList(self, recursive=1):
+    def getCategoryChildValueList(self, recursive=1, include_if_child=1):
       """
           List the child objects of this category and all its subcategories.
 
           recursive - if set to 1, list recursively
+
+          include_if_child - if set to 1, then a category is listed even if
+                      has childs. if set to 0, then don't list if child.
+                      for example:
+                        region/europe
+                        region/europe/france
+                        region/europe/germany
+                        ...
+                      becomes:
+                        region/europe/france
+                        region/europe/germany
+                        ...
+
       """
       value_list = []
       if recursive:
@@ -505,6 +518,10 @@ class BaseCategory(Category):
           value_list.extend(c.getCategoryChildValueList(recursive = 1))
       else:
         for c in self.objectValues(self.allowed_types):
+          if include_if_child:
+            value_list.append(c)
+          else:
+            if len(c.objectValues(self.allowed_types))==0:
               value_list.append(c)
       return value_list