opendev
/
storyboard
Code Issues Proposed changes

Merge "Support tags in task filter"

This commit is contained in:
Jenkins 2017-01-04 10:27:39 +00:00 committed by Gerrit Code Review
parent 1c7655aa8f 5202ec0fb9
commit 5acc366177
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storyboard/db/api/worklists.py
View File

@ -598,7 +598,8 @@ def filter_tasks(worklist, filters):
query = api_base.model_query(models.Task)
query = query.outerjoin(models.Project,
models.project_group_mapping,
models.ProjectGroup)
models.ProjectGroup,
models.StorySummary)
for criterion in filter.criteria:
attr = translate_criterion_to_field(criterion)
if hasattr(models.Task, attr):
@ -606,6 +607,16 @@ def filter_tasks(worklist, filters):
elif attr == 'project_group_id':
model = models.ProjectGroup
attr = 'id'
elif attr == 'tags':
if criterion.negative:
query = query.filter(
~models.StorySummary.tags.any(
models.StoryTag.name.in_([criterion.value])))
else:
query = query.filter(
models.StorySummary.tags.any(
models.StoryTag.name.in_([criterion.value])))
continue
else:
continue
if criterion.negative: