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

Added shot editing.

Browse Source
This commit is contained in:
Sybren A. Stüvel
2016-09-22 15:29:18 +02:00
parent d8824eeb63
commit b5d335672e
7 changed files with 138 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
attract/shots/routes.py
View File

@@ -4,6 +4,7 @@ from flask import Blueprint, render_template, request
import flask
import pillarsdk
import pillar.api.utils
from pillar.web.system_util import pillar_api
from attract.modules import attract_project_view
@@ -67,10 +68,17 @@ def view_shot(project, attract_props, shot_id):
api = pillar_api()
shot = pillarsdk.Node.find(shot_id, api=api)
node_type = project.get_node_type(node_type_shot['name'])
return render_template('attract/shots/shot.html',
if request.is_xhr:
template = 'attract/shots/view_shot_embed.html'
else:
template = 'attract/shots/view_shot.html'
return render_template(template,
shot=shot,
project=project,
shot_node_type=node_type,
attract_props=attract_props)
@@ -83,7 +91,7 @@ def save(project, shot_id):
shot_dict = request.form.to_dict()
shot = current_attract.shot_manager.edit_shot(shot_id, **shot_dict)
return flask.jsonify({'shot_id': shot_id, 'etag': shot._etag, 'time': shot._updated })
return pillar.api.utils.jsonify(shot.to_dict())
# TODO: remove GET method once Pablo has made a proper button to call this URL with a POST.

107
attract/static/js/tasks.js
View File

@@ -47,6 +47,32 @@ function task_open(task_id, project_url) {
});
}
/**
* Shows a shot in the #task-details div.
*/
function shot_open(shot_id, project_url) {
if (shot_id === undefined || project_url === undefined) {
if (console) console.log("shot_open(", shot_id, project_url, ") called.");
return;
}
$('#shot-list').find('a').removeClass('active');
$('#shot-link' + shot_id).addClass('active');
var shot_url = '/attract/' + project_url + '/shots/' + shot_id;
console.log('shot_url is ' + shot_url);
$.get(shot_url, function(shot_data) {
$('#task-details').html(shot_data);
}).fail(function(xhr) {
if (console) {
console.log('Error fetching shot', shot_id, 'from', shot_url);
console.log('XHR:', xhr);
}
$('#task-details').html(xhr.responseText);
});
}
/**
* Create a task and show it in the #task-details div.
*/
@@ -75,48 +101,79 @@ function task_create(shot_id, project_url, task_type) {
}
function task_save(task_id, task_url) {
console.log('Saving task to', task_url);
var $form = $('#task-view form');
function attract_form_save(form_id, item_id, item_save_url, options={})
{
var $form = $('#' + form_id);
var $button = $form.find("button[type='submit']");
var payload = $form.serialize();
var task = '#task-' + task_id;
var $task = $(task);
var $item = $('#' + item_id);
$button.attr('disabled', true);
$task.addClass('processing');
$item.addClass('processing');
$('#status-bar').text('Saving task...');
if (console) console.log('Sending:', payload);
$.post(task_url, payload)
.done(function(saved_task) {
if (console) console.log('Done saving', saved_task);
$.post(item_save_url, payload)
.done(function(saved_item) {
if (console) console.log('Done saving', saved_item);
$('#status-bar').text('Saved item. ' + saved_item._updated);
if (options.done) options.done($item, saved_item);
})
.fail(function(xhr_or_response_data) {
// jQuery sends the response data (if JSON), or an XHR object (if not JSON).
if (console) console.log('Failed saving', xhr_or_response_data);
$('#status-bar').text('Failed saving. ' + xhr_or_response_data.responseText);
if (options.fail) options.fail($item, xhr_or_response_data);
})
.always(function() {
$button.attr('disabled', false);
$item.removeClass('processing');
if (options.always) options.always($item);
})
;
return false; // prevent synchronous POST to current page.
}
function task_save(task_id, task_url) {
return attract_form_save('task_form', 'task-' + task_id, task_url, {
done: function($task, saved_task) {
// Update the task list.
// NOTE: this is tightly linked to the HTML of the task list in for_project.jade.
$('.task-name-' + saved_task._id).text(saved_task.name).flashOnce();
$task.find('span.name').text(saved_task.name);
$task.find('span.type').text(saved_task.task_type);
$task.find('span.status').text(saved_task.properties.status.replace('_', ' '));
// FIXME: remove all existing status-XXX classes.
$task
.removeClass('col-list-item task-list-item')
.addClass('col-list-item task-list-item status-' + saved_task.properties.status);
$('#status-bar').text('Saved task. ' + saved_task._updated);
})
.fail(function(xhr_or_response_data) {
// jQuery sends the response data (if JSON), or an XHR object (if not JSON).
if (console) console.log('Failed saving', xhr_or_response_data);
},
fail: function($item, xhr_or_response_data) {
$('#task-details').html(xhr_or_response_data.responseText);
$('#status-bar').text('Failed saving. ' + xhr_or_response_data.responseText);
})
.always(function() {
$button.attr('disabled', false);
$task.removeClass('processing');
})
;
return false; // prevent synchronous POST to current page.
}
});
}
function shot_save(shot_id, shot_url) {
return attract_form_save('shot_form', 'shot-' + shot_id, shot_url, {
done: function($shot, saved_shot) {
// Update the shot list.
$('.shot-name-' + saved_shot._id).text(saved_shot.name).flashOnce();
// FIXME: remove all existing status-XXX classes.
$shot
.removeClass('col-list-item shot-list-item')
.addClass('col-list-item shot-list-item status-' + saved_shot.properties.status);
},
fail: function($item, xhr_or_response_data) {
$('#task-details').html(xhr_or_response_data.responseText);
}
});
}