opendev/storyboard
Code Issues Proposed changes

Merge "Check story permissions when populating automatic worklists"

Browse Source
This commit is contained in:
Jenkins 2017-10-05 13:43:36 +00:00 committed by Gerrit Code Review
commit acce431b30
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storyboard/api/v1/wmodels.py
View File

@ -817,7 +817,7 @@ class Worklist(base.APIBase):
@nodoc @nodoc
def _resolve_automatic_items(self, worklist, user_id): def _resolve_automatic_items(self, worklist, user_id):
items, stories, tasks = worklists_api.filter_items(worklist) items, stories, tasks = worklists_api.filter_items(worklist, user_id)
story_cache = {story.id: story for story in stories} story_cache = {story.id: story for story in stories}
task_cache = {task.id: task for task in tasks} task_cache = {task.id: task for task in tasks}
for item in items: for item in items:

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

@ -1,4 +1,5 @@
# Copyright (c) 2015-2016 Codethink Limited # Copyright (c) 2015-2016 Codethink Limited
# Copyright (c) 2017 Adam Coldrick
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -540,7 +541,7 @@ def translate_criterion_to_field(criterion):
return criterion_fields[criterion.field] return criterion_fields[criterion.field]
def filter_stories(worklist, filters): def filter_stories(worklist, filters, user_id):
filter_queries = [] filter_queries = []
for filter in filters: for filter in filters:
subquery = api_base.model_query(models.Story.id).distinct().subquery() subquery = api_base.model_query(models.Story.id).distinct().subquery()
@ -585,14 +586,19 @@ def filter_stories(worklist, filters):
if len(filter_queries) > 1: if len(filter_queries) > 1:
query = filter_queries[0] query = filter_queries[0]
query = query.union(*filter_queries[1:]) query = query.union(*filter_queries[1:])
query = api_base.filter_private_stories(
query, user_id, models.StorySummary)
return query.all() return query.all()
elif len(filter_queries) == 1: elif len(filter_queries) == 1:
return filter_queries[0].all() query = filter_queries[0]
query = api_base.filter_private_stories(
query, user_id, models.StorySummary)
return query.all()
else: else:
return [] return []
def filter_tasks(worklist, filters): def filter_tasks(worklist, filters, user_id):
filter_queries = [] filter_queries = []
for filter in filters: for filter in filters:
query = api_base.model_query(models.Task) query = api_base.model_query(models.Task)
@ -628,23 +634,28 @@ def filter_tasks(worklist, filters):
if len(filter_queries) > 1: if len(filter_queries) > 1:
query = filter_queries[0] query = filter_queries[0]
query = query.union(*filter_queries[1:]) query = query.union(*filter_queries[1:])
query = api_base.filter_private_stories(
query, user_id, models.StorySummary)
return query.all() return query.all()
elif len(filter_queries) == 1: elif len(filter_queries) == 1:
return filter_queries[0].all() query = filter_queries[0]
query = api_base.filter_private_stories(
query, user_id, models.StorySummary)
return query.all()
else: else:
return [] return []
def filter_items(worklist): def filter_items(worklist, user_id):
story_filters = [f for f in worklist.filters if f.type == 'Story'] story_filters = [f for f in worklist.filters if f.type == 'Story']
task_filters = [f for f in worklist.filters if f.type == 'Task'] task_filters = [f for f in worklist.filters if f.type == 'Task']
filtered_stories = [] filtered_stories = []
filtered_tasks = [] filtered_tasks = []
if story_filters: if story_filters:
filtered_stories = filter_stories(worklist, story_filters) filtered_stories = filter_stories(worklist, story_filters, user_id)
if task_filters: if task_filters:
filtered_tasks = filter_tasks(worklist, task_filters) filtered_tasks = filter_tasks(worklist, task_filters, user_id)
items = [] items = []
for story in filtered_stories: for story in filtered_stories: