просмотр и удаление изображений в админке в мутизагрузке сразу же после загрузки

remotes/origin/HEAD
Slava Kyrachevsky 9 years ago
parent 01a64572d4
commit 43d1d98353
  1. 7
      apps/exposition/forms.py
  2. 10
      apps/photologue/admin.py
  3. 6
      static/jQuery-filer/js/init.js
  4. 6
      static/jQuery-filer/js/jquery.filer.js

@ -212,12 +212,6 @@ class ExpositionCreateForm(forms.Form):
exposition.quality_label = quality 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.country = Country.objects.get(id=data['country'])
exposition.city = City.objects.get(id=data['city']) exposition.city = City.objects.get(id=data['city'])
@ -236,6 +230,7 @@ class ExpositionCreateForm(forms.Form):
exposition.theme.add(*data['theme']) exposition.theme.add(*data['theme'])
exposition.tag.add(*Tag.objects.filter(id__in=data['tag'])) exposition.tag.add(*Tag.objects.filter(id__in=data['tag']))
exposition.organiser.add(*Organiser.objects.filter(id__in=data.get('organiser', []))) 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', []))) #exposition.company.add(*Company.objects.filter(id__in=data.get('company', [])))

@ -151,7 +151,17 @@ def upload_photo(request, id, Model):
photo = form.save() photo = form.save()
obj.upload_photo(photo) obj.upload_photo(photo)
im = get_thumbnail(
photo.image, '188x143', crop='center', quality=99
)
data['success'] = True 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: else:
data['errors'] = form.errors data['errors'] = form.errors

@ -101,13 +101,17 @@ function init_filer($target) {
itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){ itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){
$("<div class=\"jFiler-item-others text-success\"><i class=\"icon-jfi-check-circle\"></i> Success</div>").hide().appendTo(parent).fadeIn("slow"); $("<div class=\"jFiler-item-others text-success\"><i class=\"icon-jfi-check-circle\"></i> Success</div>").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 { } else {
var parent = itemEl.find(".jFiler-jProgressBar").parent(); var parent = itemEl.find(".jFiler-jProgressBar").parent();
itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){ itemEl.find(".jFiler-jProgressBar").fadeOut("slow", function(){
$("<div class=\"jFiler-item-others text-error\"><i class=\"icon-jfi-minus-circle\"></i> Error</div>").hide().appendTo(parent).fadeIn("slow"); $("<div class=\"jFiler-item-others text-error\"><i class=\"icon-jfi-minus-circle\"></i> Error</div>").hide().appendTo(parent).fadeIn("slow");
}); });
} }
}, },
error: function(el){ error: function(el){
var parent = el.find(".jFiler-jProgressBar").parent(); var parent = el.find(".jFiler-jProgressBar").parent();

@ -577,7 +577,7 @@
formData.append(s.attr('name'), c.file, (c.file.name ? c.file.name : false)); 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)) { 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) { 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: [], _itFr: [],
_itPl: [], _itPl: [],
_ajFc: 0 _ajFc: 0
} };
s.on("filer.append", function(e, data) { s.on("filer.append", function(e, data) {
f._append(e, data) f._append(e, data);
}).on("filer.remove", function(e, data) { }).on("filer.remove", function(e, data) {
data.binded = true; data.binded = true;
f._remove(e, data); f._remove(e, data);

Loading…
Cancel
Save