opendev
/
storyboard
Code Issues Proposed changes

Merge "Properly populate Worklist.items in automatic worklists"

This commit is contained in:
Zuul 2018-02-27 16:32:00 +00:00 committed by Gerrit Code Review
parent 93d7c02488 bdc0ead231
commit 965195a98a
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -896,14 +896,21 @@ class Lane(base.APIBase):
self.worklist = Worklist.from_db_model(lane.worklist)
self.worklist.resolve_permissions(lane.worklist)
self.worklist.resolve_filters(lane.worklist)
user_id = request.current_user_id
if resolve_items:
self.worklist.resolve_items(
lane.worklist, story_cache, task_cache)
else:
elif not lane.worklist.automatic:
items = worklists_api.get_visible_items(
lane.worklist, current_user=request.current_user_id)
lane.worklist, current_user=user_id)
self.worklist.items = [WorklistItem.from_db_model(item)
for item in items]
else:
self.worklist.items = [
WorklistItem(**item)
for item in worklists_api.filter_items(
lane.worklist, user_id)[0]
]
class Board(base.APIBase):

15
storyboard/api/v1/worklists.py
View File

@ -704,10 +704,17 @@ class WorklistsController(rest.RestController):
worklist_model.resolve_permissions(worklist)
visible_items = worklists_api.get_visible_items(
worklist, request.current_user_id)
worklist_model.items = [
wmodels.WorklistItem.from_db_model(item)
for item in visible_items
]
if not worklist.automatic:
worklist_model.items = [
wmodels.WorklistItem.from_db_model(item)
for item in visible_items
]
else:
worklist_model.items = [
wmodels.WorklistItem(**item)
for item in worklists_api.filter_items(
worklist, request.current_user_id)[0]
]
visible_worklists.append(worklist_model)
# Apply the query response headers