Commit 565ca688 authored by Aurel's avatar Aurel

clean a bit the code


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37971 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 114b07a5
...@@ -711,7 +711,6 @@ class ObjectTemplateItem(BaseTemplateItem): ...@@ -711,7 +711,6 @@ class ObjectTemplateItem(BaseTemplateItem):
def build_sub_objects(self, context, id_list, url, **kw): def build_sub_objects(self, context, id_list, url, **kw):
# XXX duplicates code from build # XXX duplicates code from build
p = context.getPortalObject() p = context.getPortalObject()
sub_list = {}
for id in id_list: for id in id_list:
relative_url = '/'.join([url,id]) relative_url = '/'.join([url,id])
obj = p.unrestrictedTraverse(relative_url) obj = p.unrestrictedTraverse(relative_url)
...@@ -729,7 +728,6 @@ class ObjectTemplateItem(BaseTemplateItem): ...@@ -729,7 +728,6 @@ class ObjectTemplateItem(BaseTemplateItem):
obj.groups = groups obj.groups = groups
self._objects[relative_url] = obj self._objects[relative_url] = obj
obj.wl_clearLocks() obj.wl_clearLocks()
return sub_list
def build(self, context, **kw): def build(self, context, **kw):
BaseTemplateItem.build(self, context, **kw) BaseTemplateItem.build(self, context, **kw)
...@@ -1370,7 +1368,7 @@ class PathTemplateItem(ObjectTemplateItem): ...@@ -1370,7 +1368,7 @@ class PathTemplateItem(ObjectTemplateItem):
keys.sort() keys.sort()
for path in keys: for path in keys:
include_subobjects = 0 include_subobjects = 0
if '**' in path: if path.endswith("**"):
include_subobjects = 1 include_subobjects = 1
for relative_url in self._resolvePath(p, [], path.split('/')): for relative_url in self._resolvePath(p, [], path.split('/')):
obj = p.unrestrictedTraverse(relative_url) obj = p.unrestrictedTraverse(relative_url)
......
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