entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 40 Releases Activity

fix Or([Equal]) instead of Contains

This commit is contained in:
Pierre Ducroquet 2022-07-27 17:18:44 +02:00
parent a95687397b
commit 1233847add
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wcs/backoffice/management.py
View File

@ -82,7 +82,6 @@ from ..qommon.storage import (
NotEqual,
NotNull,
Null,
Or,
StrictNotEqual,
)
from ..qommon.substitution import CompatibilityNamesDict
@ -2660,7 +2659,7 @@ class FormPage(Directory):
except KeyError:
applied_filters = None
if applied_filters:
criterias.append(Or([Equal('status', x) for x in applied_filters]))
criterias.append(Contains('status', applied_filters))
criterias[-1]._label = criteria_label
displayed_criterias = criterias

4
wcs/statistics/views.py
View File

@ -29,7 +29,7 @@ from wcs.categories import Category
from wcs.formdef import FormDef
from wcs.qommon import _, misc
from wcs.qommon.misc import C_
from wcs.qommon.storage import Equal, Or, StrictNotEqual
from wcs.qommon.storage import Contains, Equal, StrictNotEqual
class RestrictedView(View):
@ -270,7 +270,7 @@ class FormsCountView(RestrictedView):
pass
if applied_filters:
criterias.append(Or([Equal('status', x) for x in applied_filters]))
criterias.append(Contains('status', applied_filters))
else:
criterias = [StrictNotEqual('status', 'draft')] + criterias

6
wcs/variables.py
View File

@ -26,7 +26,7 @@ from .formdata import get_workflow_roles_substitution_variables
from .formdef import FormDef, FormDefDoesNotExist
from .qommon import _, force_str, misc
from .qommon.evalutils import make_datetime
from .qommon.storage import And, Equal, Intersects, Not, NotEqual, NotNull, Null, Or, StrictNotEqual
from .qommon.storage import And, Contains, Equal, Intersects, Not, NotEqual, NotNull, Null, Or, StrictNotEqual
from .qommon.substitution import CompatibilityNamesDict
from .qommon.templatetags.qommon import parse_datetime
@ -87,7 +87,7 @@ class LazyFormDefObjectsManager:
def pending(self):
status_filters = ['wf-%s' % x.id for x in self._formdef.workflow.get_not_endpoint_status()]
criterias = [Or([Equal('status', x) for x in status_filters])]
criterias = [Contains('status', status_filters)]
return self._clone(self._criterias + criterias)
def current_user(self): # filter on current user
@ -143,7 +143,7 @@ class LazyFormDefObjectsManager:
def done(self):
status_filters = ['wf-%s' % x.id for x in self._formdef.workflow.get_endpoint_status()]
criterias = [Or([Equal('status', x) for x in status_filters])]
criterias = [Contains('status', status_filters)]
return self._clone(self._criterias + criterias)
def set_geo_center(self, lazy_formdata):