Commit 502873f4 authored by Jérome Perrin's avatar Jérome Perrin

remove a LOG and fix typos


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14676 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a72ec045
...@@ -243,7 +243,7 @@ class Category(Folder): ...@@ -243,7 +243,7 @@ class Category(Folder):
objects of the same depth by comparing their objects of the same depth by comparing their
'local_sort_id' property. 'local_sort_id' property.
Renderer parameter are also supported here. Renderer parameters are also supported here.
""" """
if is_self_excluded or ( if is_self_excluded or (
not(include_if_child) and not(include_if_child) and
...@@ -305,7 +305,8 @@ class Category(Folder): ...@@ -305,7 +305,8 @@ class Category(Folder):
Returns a list of tuples by parsing recursively all categories in a Returns a list of tuples by parsing recursively all categories in a
given list of base categories. Uses getTitle as default method given list of base categories. Uses getTitle as default method
""" """
return self.getCategoryChildItemList(recursive=recursive, display_id='title', base=base, **kw) return self.getCategoryChildItemList(recursive=recursive,
display_id='title', base=base, **kw)
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
'getCategoryChildTranslatedTitleItemList') 'getCategoryChildTranslatedTitleItemList')
...@@ -414,11 +415,11 @@ class Category(Folder): ...@@ -414,11 +415,11 @@ class Category(Folder):
recursive -- if set to 0 do not apply recursively recursive -- if set to 0 do not apply recursively
All parameter supported by getCategoryChildValueList and Render are All parameters supported by getCategoryChildValueList and Render are
supported here. supported here.
""" """
def _renderCategoryChildItemList(recursive=1, base=0, **kw): def _renderCategoryChildItemList(recursive=1, base=0, **kw):
value_list = self.getCategoryChildValueList(recursive=recursive,**kw) value_list = self.getCategoryChildValueList(recursive=recursive, **kw)
return Renderer(base=base, **kw).render(value_list) return Renderer(base=base, **kw).render(value_list)
if not cache: if not cache:
...@@ -426,7 +427,7 @@ class Category(Folder): ...@@ -426,7 +427,7 @@ class Category(Folder):
# Some methods are language dependent so we include the language in the key # Some methods are language dependent so we include the language in the key
localizer = getToolByName(self, 'Localizer') localizer = getToolByName(self, 'Localizer')
language = localizer.get_selected_language() language = localizer.get_selected_language()
m = CachingMethod(_renderCategoryChildItemList, m = CachingMethod(_renderCategoryChildItemList,
('Category_getCategoryChildItemList', language, self.getPath())) ('Category_getCategoryChildItemList', language, self.getPath()))
...@@ -490,8 +491,6 @@ class Category(Folder): ...@@ -490,8 +491,6 @@ class Category(Folder):
can be useful to create reporting trees based on the can be useful to create reporting trees based on the
ZSQLCatalog ZSQLCatalog
""" """
#LOG('Category.asSQLExpression self', 0, str(self))
#LOG('asSQLExpression parent', 0, str(self.aq_parent))
if base_category is None: if base_category is None:
base_category = self base_category = self
elif type(base_category) is type('a'): elif type(base_category) is type('a'):
...@@ -705,7 +704,7 @@ class BaseCategory(Category): ...@@ -705,7 +704,7 @@ class BaseCategory(Category):
objects of the same depth by comparing their objects of the same depth by comparing their
'local_sort_id' property. 'local_sort_id' property.
Renderer parameter are also supported here. Renderer parameters are also supported here.
""" """
if is_self_excluded: if is_self_excluded:
...@@ -722,8 +721,6 @@ class BaseCategory(Category): ...@@ -722,8 +721,6 @@ class BaseCategory(Category):
child_value_list = list(child_value_list) child_value_list = list(child_value_list)
child_value_list.sort(local_sort_method) child_value_list.sort(local_sort_method)
LOG('self %s' % self, 0, (local_sort_id, local_sort_method))
if recursive: if recursive:
for c in child_value_list: for c in child_value_list:
value_list.extend(c.getCategoryChildValueList(recursive=1, value_list.extend(c.getCategoryChildValueList(recursive=1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment