archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Asset/shot lists: use task types from project's Attract properties

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-06-14 12:27:01 +02:00
parent 23a2a8fd64
commit f05ad37037
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
attract/shots_and_assets/routes_assets.py
View File

@@ -25,9 +25,11 @@ log = logging.getLogger(__name__)
@perproject_blueprint.route('/with-task/<task_id>', endpoint='with_task') @perproject_blueprint.route('/with-task/<task_id>', endpoint='with_task')
@attract_project_view(extension_props=True) @attract_project_view(extension_props=True)
def for_project(project, attract_props, task_id=None, asset_id=None): 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( assets, tasks_for_assets, task_types_for_template = routes_common.for_project(
node_type_asset['name'], node_type_name,
task_types, attract_props['task_types'][node_type_name],
project, attract_props, task_id, asset_id) project, attract_props, task_id, asset_id)
return render_template('attract/assets/for_project.html', return render_template('attract/assets/for_project.html',

6
attract/shots_and_assets/routes_shots.py
View File

@@ -25,9 +25,11 @@ log = logging.getLogger(__name__)
@perproject_blueprint.route('/with-task/<task_id>', endpoint='with_task') @perproject_blueprint.route('/with-task/<task_id>', endpoint='with_task')
@attract_project_view(extension_props=True) @attract_project_view(extension_props=True)
def for_project(project, attract_props, task_id=None, shot_id=None): 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( shots, tasks_for_shots, task_types_for_template = routes_common.for_project(
node_type_shot['name'], node_type_name,
task_types, attract_props['task_types'][node_type_name],
project, attract_props, task_id, shot_id) project, attract_props, task_id, shot_id)
# Some aggregated stats # Some aggregated stats