archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Introducing attachments fixes for blog posts and assets.

Browse Source 
Requires migration of attachments schema using
python manage.py maintenance upgrade_attachment_schema --all
This commit is contained in:
Francesco Siddi
2017-02-08 18:10:05 +01:00
parent eca4ade9d8
commit 6765276519
16 changed files with 204 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/templates/nodes/edit_embed.jade
View File

@@ -148,10 +148,19 @@ script(type="text/javascript").
/* Submit changes */
$("#node-edit-form").unbind( "submit" )
.submit(function(e) {
$("#node-edit-form").unbind("submit").submit(function(e) {
e.preventDefault();
// Assets always need a file
var $file = $('.form-group.file #file');
if ($file.val() == '') {
$file.addClass('error');
statusBarSet('error', 'No File Selected', 'pi-warning', 5000);
return jQuery.Deferred().reject("nofile");
}
$file.removeClass('error');
/* Let us know started saving */
$("li.button-save").addClass('saving');
$("li.button-save a#item_save").html('<i class="pi-spin spin"></i> Saving...');
@@ -181,7 +190,10 @@ script(type="text/javascript").
})
.done(function(dataHtml){
/* Success! */
// Disable beforeunolad when submitting a form
$(window).off('beforeunload');
{% if is_embedded_edit %}
/* Load content*/
$('#project_context').html(dataHtml);
statusBarSet('success', 'Saved Successfully', 'pi-check');
@@ -194,24 +206,18 @@ script(type="text/javascript").
//- $('#project_tree').jstree("refresh");
updateUi(ProjectUtils.nodeId(), 'view');
{% else %}
// This code runs only if we are in direct node editing mode, and since we do a redirect,
// nothing of what follows is executed, because of the redirect.
location.href = "{{ url_for('nodes.view', node_id=node._id)}}";
{% endif %}
});
});
$('#item_save, .item-save').click(function(e){
e.preventDefault();
// Assets always need a file
if ($('.form-group.file #file').val() == ''){
$('.form-group.file').addClass('error');
statusBarSet('error', 'No File Selected', 'pi-warning', 5000);
} else {
$('.form-group.file').removeClass('error');
$("#node-edit-form").submit();
// Disable beforeunolad when submitting a form
$(window).off('beforeunload');
}
$("#node-edit-form").submit();
});
$('#item_cancel, .item-cancel').click(function(e){