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

Added possibility to select AND/OR operator for searches in lists.

Browse source
This commit is contained in:
Gaetan Delannay 2010-03-19 13:13:36 +01:00
parent cbb77e0224
commit f70af04d4c
5 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gen/plone25/mixins/ToolMixin.py
View file

@ -443,6 +443,7 @@ class ToolMixin(AbstractMixin):
# given field.
attrValue = rq.form[attrName]
if attrName.find('*') != -1:
# The type of the value is encoded after char "*".
attrName, attrType = attrName.split('*')
if attrType == 'bool':
exec 'attrValue = %s' % attrValue
@ -471,7 +472,12 @@ class ToolMixin(AbstractMixin):
toDate = self._getDateTime(year, month, day, False)
attrValue = (fromDate, toDate)
if isinstance(attrValue, list):
attrValue = ' OR '.join(attrValue)
# It is a list of values. Check if we have an operator for
# the field, to see if we make an "and" or "or" for all
# those values. "or" will be the default.
operKey = 'o_%s' % attrName[2:]
oper = ' %s ' % rq.form.get(operKey, 'or').upper()
attrValue = oper.join(attrValue)
criteria[attrName[2:]] = attrValue
rq.SESSION['searchCriteria'] = criteria
# Goto the screen that displays search results