Added "View in shot context" to task detail when viewed in task context.

This commit is contained in:
2016-10-11 15:53:19 +02:00
parent b7c6402453
commit 3c2a00b086
3 changed files with 9 additions and 1 deletions

View File

@@ -100,7 +100,8 @@ def view_task(project, attract_props, task_id):
task=task, task=task,
project=project, project=project,
task_node_type=node_type, task_node_type=node_type,
attract_props=attract_props.to_dict()) attract_props=attract_props.to_dict(),
attract_context=request.args.get('context'))
@perproject_blueprint.route('/<task_id>', methods=['POST']) @perproject_blueprint.route('/<task_id>', methods=['POST'])

View File

@@ -43,6 +43,7 @@ function item_open(item_id, item_type, pushState, project_url)
if (ProjectUtils.context() == 'shot' && item_type == 'task'){ if (ProjectUtils.context() == 'shot' && item_type == 'task'){
push_url = '/attract/' + project_url + '/shots/with-task/' + item_id; push_url = '/attract/' + project_url + '/shots/with-task/' + item_id;
} }
item_url += '?context=' + ProjectUtils.context();
$('#status-bar').text('Loading ' + item_type + '…'); $('#status-bar').text('Loading ' + item_type + '…');

View File

@@ -25,6 +25,12 @@
a(href="javascript:void(0)") a(href="javascript:void(0)")
i.pi-clipboard-copy i.pi-clipboard-copy
| Copy ID to Clipboard | Copy ID to Clipboard
| {% if attract_context != 'shot' and task.parent %}
li
a(href="{{ url_for('attract.shots.perproject.with_task', project_url=project['url'], task_id=task['_id']) }}")
i.pi-film-thick
| View in shot context
| {% endif %}
| {% if 'DELETE' in task.allowed_methods %} | {% if 'DELETE' in task.allowed_methods %}
li.divider(role='separator') li.divider(role='separator')
li.item-delete li.item-delete