Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-24 14:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

error forms returned from invalid image edit after upload, are now working

Browse source
This commit is contained in:
Dave Cranwell 2014-07-17 11:02:32 +01:00
parent af906b9197
commit 363703405a
4 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
View file

@ -734,6 +734,7 @@ ul.tagit li.tagit-choice-editable{
padding:$mobile-nice-padding;
background-color:$color-grey-5;
margin-bottom:1em;
text-align:center;
.drop-zone-help{
border:0;

55
wagtail/wagtailimages/static/wagtailimages/js/add-multiple.js
View file

@ -17,7 +17,7 @@ $(function(){
add: function (e, data) {
var $this = $(this);
var that = $this.data('blueimp-fileupload') || $this.data('fileupload')
var li = $($('#upload-list-item').html()).addClass('uploading')
var li = $($('#upload-list-item').html()).addClass('upload-uploading')
var options = that.options;
$('#upload-list').append(li);
@ -84,34 +84,39 @@ $(function(){
var itemElement = $(data.context);
itemElement.addClass('upload-success')
$('.right', itemElement).append(data.result);
$('.tag_field input', itemElement).tagit(window.tagit_opts);
$('form', itemElement).each(function(){
var jform = $(this);
// ajax-enhance forms added on done()
$('#upload-list').on('submit', 'form', function(e){
var form = $(this);
e.preventDefault();
jform.submit(function(event) { //convert save to an ajax call
event.preventDefault();
$.post(this.action, $(this).serialize(), function(data) {
var result = $.parseJSON(data);
if (result.success) {
itemElement.slideUp(function(){$(this).remove()});
}
});
$.post(this.action, form.serialize(), function(data) {
if (data.success) {
itemElement.slideUp(function(){$(this).remove()});
}else{
console.log(data);
form.replaceWith(data.form);
$('.tag_field input', form).tagit(window.tagit_opts);
}
});
jform.find('.delete').each(function(){ //convert delete to an ajax call
$(this).click(function(event) {
event.preventDefault();
$.post(this.href, jform.serialize(), function(data) {
var result = $.parseJSON(data);
if (result.success) {
itemElement.slideUp(function(){$(this).remove()});
}
});
});
});
jform.find('.tag_field input').tagit(window.tagit_opts);
});
$('#upload-list').on('click', '.delete', function(e){
var form = $(this);
e.preventDefault();
$.post(this.href, form.serialize(), function(data) {
if (data.success) {
itemElement.slideUp(function(){$(this).remove()});
}else{
}
});
});
},
fail: function(e, data){

1
wagtail/wagtailimages/static/wagtailimages/scss/add-multiple.scss
View file

@ -6,6 +6,7 @@
display:inline-block;
position:relative;
overflow:hidden;
padding-bottom:2px;
input[type=file]{
padding:0;

3
wagtail/wagtailimages/views/multiple.py
View file

@ -6,6 +6,7 @@ from django.views.decorators.http import require_POST
from django.core.exceptions import PermissionDenied
from django.views.decorators.vary import vary_on_headers
from django.http import HttpResponse, HttpResponseBadRequest
from django.template import RequestContext
from django.template.loader import render_to_string
from wagtail.wagtailimages.models import get_image_model
@ -70,7 +71,7 @@ def edit(request, image_id, callback=None):
'form': render_to_string('wagtailimages/multiple/edit_form.html', {
'image': image,
'form': form,
}),
}, context_instance=RequestContext(request)),
})