rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Search: bugfix in filtered unnamed searches.

Browse source
This commit is contained in:
Gaetan Delannay 2015-03-09 13:36:48 +01:00
parent 5c6952537e
commit 4d154c314f
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gen/mixins/ToolMixin.py
View file

@ -504,7 +504,7 @@ class ToolMixin(BaseMixin):
If p_klass does not define this attr "creators", we will use a
default list of roles as defined in the config.'''
# Get the value of attr "creators", or a default value if not present.
# Get the value of attr "creators", or a default value if not present
if hasattr(klass, 'creators'):
creators = klass.creators
else:
@ -741,6 +741,9 @@ class ToolMixin(BaseMixin):
# It is a custom search whose parameters are in the session
fields = self.REQUEST.SESSION['searchCriteria']
res = Search('customSearch', **fields)
elif (name == 'allSearch') or not name:
# It is the search for every instance of p_className
res = Search('allSearch')
elif '*' in name:
# The search is defined in a Ref field with link=popup. Get the
# search, the initiator object and the Ref field.
@ -748,7 +751,7 @@ class ToolMixin(BaseMixin):
initiator = self.getObject(uid, appy=True)
initiatorField = initiator.getField(ref)
res = getattr(initiator.klass, ref).select
elif name:
else:
appyClass = self.getAppyClass(className)
# Search among static searches
res = ClassDescriptor.getSearch(appyClass, name)
@ -758,9 +761,6 @@ class ToolMixin(BaseMixin):
if search.name == name:
res = search
break
else:
# It is the search for every instance of p_className
res = Search('allSearch')
# Return a UiSearch if required
if ui:
res = UiSearch(res, className, self)