openstack/mistral
Code Issues Proposed changes

Merge "Fixing filtering in task controller"

Browse Source
This commit is contained in:
Jenkins 2016-07-14 12:04:05 +00:00 committed by Gerrit Code Review
commit 4bc8163407
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mistral/api/controllers/v2/task.py
View File

@ -109,7 +109,7 @@ def _get_task_resource_with_result(task_ex):
return task return task
def _get_task_resources_with_results(wf_ex_id=None, marker=None, limit=None, def _get_task_resources_with_results(marker=None, limit=None,
sort_keys='created_at', sort_dirs='asc', sort_keys='created_at', sort_dirs='asc',
fields='', **filters): fields='', **filters):
"""Return all tasks within the execution. """Return all tasks within the execution.
@ -133,9 +133,6 @@ def _get_task_resources_with_results(wf_ex_id=None, marker=None, limit=None,
constructing 'next' link. constructing 'next' link.
:param filters: Optional. A list of filters to apply to the result. :param filters: Optional. A list of filters to apply to the result.
""" """
if wf_ex_id:
filters['workflow_execution_id'] = wf_ex_id
return rest_utils.get_all( return rest_utils.get_all(
Tasks, Tasks,
Task, Task,
@ -357,9 +354,8 @@ class ExecutionTasksController(rest.RestController):
acl.enforce('tasks:list', context.ctx()) acl.enforce('tasks:list', context.ctx())
filters = rest_utils.filters_to_dict( filters = rest_utils.filters_to_dict(
wf_ex_id=workflow_execution_id, workflow_execution_id=workflow_execution_id,
created_at=created_at, created_at=created_at,
id=id,
workflow_name=workflow_name, workflow_name=workflow_name,
workflow_id=workflow_id, workflow_id=workflow_id,
state=state, state=state,
@ -379,7 +375,6 @@ class ExecutionTasksController(rest.RestController):
filters) filters)
return _get_task_resources_with_results( return _get_task_resources_with_results(
wf_ex_id=workflow_execution_id,
marker=marker, marker=marker,
limit=limit, limit=limit,
sort_keys=sort_keys, sort_keys=sort_keys,