From f05ad3703746522b791cc0c179bab618c0e4a001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 14 Jun 2017 12:27:01 +0200 Subject: [PATCH] Asset/shot lists: use task types from project's Attract properties --- attract/shots_and_assets/routes_assets.py | 6 ++++-- attract/shots_and_assets/routes_shots.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/attract/shots_and_assets/routes_assets.py b/attract/shots_and_assets/routes_assets.py index 23da3e9..8c887bc 100644 --- a/attract/shots_and_assets/routes_assets.py +++ b/attract/shots_and_assets/routes_assets.py @@ -25,9 +25,11 @@ log = logging.getLogger(__name__) @perproject_blueprint.route('/with-task/', endpoint='with_task') @attract_project_view(extension_props=True) def for_project(project, attract_props, task_id=None, asset_id=None): + node_type_name = node_type_asset['name'] + assets, tasks_for_assets, task_types_for_template = routes_common.for_project( - node_type_asset['name'], - task_types, + node_type_name, + attract_props['task_types'][node_type_name], project, attract_props, task_id, asset_id) return render_template('attract/assets/for_project.html', diff --git a/attract/shots_and_assets/routes_shots.py b/attract/shots_and_assets/routes_shots.py index 74c9687..bef0d5e 100644 --- a/attract/shots_and_assets/routes_shots.py +++ b/attract/shots_and_assets/routes_shots.py @@ -25,9 +25,11 @@ log = logging.getLogger(__name__) @perproject_blueprint.route('/with-task/', endpoint='with_task') @attract_project_view(extension_props=True) def for_project(project, attract_props, task_id=None, shot_id=None): + node_type_name = node_type_shot['name'] + shots, tasks_for_shots, task_types_for_template = routes_common.for_project( - node_type_shot['name'], - task_types, + node_type_name, + attract_props['task_types'][node_type_name], project, attract_props, task_id, shot_id) # Some aggregated stats