diff --git a/apps/exposition/forms.py b/apps/exposition/forms.py index f0f92710..05172454 100644 --- a/apps/exposition/forms.py +++ b/apps/exposition/forms.py @@ -212,12 +212,6 @@ class ExpositionCreateForm(forms.Form): exposition.quality_label = quality - audience = 0 - if data['audience']: - audience = reduce(lambda x,y: x|y, (getattr(Exposition.audience, item) for item in data['audience'])) - - exposition.audience = audience - exposition.country = Country.objects.get(id=data['country']) exposition.city = City.objects.get(id=data['city']) @@ -236,6 +230,7 @@ class ExpositionCreateForm(forms.Form): exposition.theme.add(*data['theme']) exposition.tag.add(*Tag.objects.filter(id__in=data['tag'])) exposition.organiser.add(*Organiser.objects.filter(id__in=data.get('organiser', []))) + exposition.audience.add(*data['audience']) #exposition.company.add(*Company.objects.filter(id__in=data.get('company', []))) diff --git a/apps/photologue/admin.py b/apps/photologue/admin.py index f5a0b993..065f0a2e 100644 --- a/apps/photologue/admin.py +++ b/apps/photologue/admin.py @@ -151,7 +151,17 @@ def upload_photo(request, id, Model): photo = form.save() obj.upload_photo(photo) + im = get_thumbnail( + photo.image, '188x143', crop='center', quality=99 + ) + data['success'] = True + data['name'] = photo.title or photo.image.name + data['size'] = photo.image.size + data['file'] = im.url + data['type'] = 'image' + data['remove_url'] = photo.get_delete_url() + data['detail_link'] = photo.admin_url() else: data['errors'] = form.errors diff --git a/static/jQuery-filer/js/init.js b/static/jQuery-filer/js/init.js index 5bded9ae..2cd12dc8 100644 --- a/static/jQuery-filer/js/init.js +++ b/static/jQuery-filer/js/init.js @@ -101,13 +101,17 @@ function init_filer($target) { itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){ $("
Success
").hide().appendTo(parent).fadeIn("slow"); }); + itemEl.find('.jFiler-item-trash-action').attr('href', data.remove_url); + itemEl + .find('.jFiler-item-thumb') + .attr('href', data.detail_link) + .css('cursor', 'pointer'); } else { var parent = itemEl.find(".jFiler-jProgressBar").parent(); itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){ $("
Error
").hide().appendTo(parent).fadeIn("slow"); }); } - }, error: function(el){ var parent = el.find(".jFiler-jProgressBar").parent(); diff --git a/static/jQuery-filer/js/jquery.filer.js b/static/jQuery-filer/js/jquery.filer.js index 35167aad..a1c8f632 100755 --- a/static/jQuery-filer/js/jquery.filer.js +++ b/static/jQuery-filer/js/jquery.filer.js @@ -577,7 +577,7 @@ formData.append(s.attr('name'), c.file, (c.file.name ? c.file.name : false)); if (n.uploadFile.data != null && $.isPlainObject(typeof(n.uploadFile.data) == "function" ? n.uploadFile.data(c.file) : n.uploadFile.data)) { for (var k in n.uploadFile.data) { - formData.append(k, n.uploadFile.data[k]) + formData.append(k, n.uploadFile.data[k]); } } @@ -1035,10 +1035,10 @@ _itFr: [], _itPl: [], _ajFc: 0 - } + }; s.on("filer.append", function(e, data) { - f._append(e, data) + f._append(e, data); }).on("filer.remove", function(e, data) { data.binded = true; f._remove(e, data);