From 6c3b3091fb5d432fb5cbeca03fcd17d3d2e2d551 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Tue, 14 Feb 2017 11:10:23 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BA=20=D1=84=D0=B0=D0=B9=D0=BB=D1=83=20=D1=81=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D1=83=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B2=20=D0=B0=D0=B4?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/file/admin.py | 9 ++++++++- apps/file/models.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/file/admin.py b/apps/file/admin.py index 8ffd08ac..fbb446c4 100644 --- a/apps/file/admin.py +++ b/apps/file/admin.py @@ -30,8 +30,15 @@ def ajax_post_file(request, obj_id): if request.is_ajax() and request.method == 'POST': file_form = FileForm(request.POST, request.FILES) if file_form.is_valid(): - file_form.save(request.FILES, obj) + f = file_form.save(request.FILES, obj) + mime = magic.Magic(mime=True) data['success'] = True + data['name'] = f.file_name or f.file_path.name + data['size'] = f.file_path.size + data['file'] = f.file_path.url + data['type'] = mime.from_file(f.file_path.path) + data['remove_url'] = reverse('ajax_delete_file', args=[f.pk]) + data['detail_link'] = reverse('file_update', args=[f.pk]) else: data['errors'] = file_form.errors diff --git a/apps/file/models.py b/apps/file/models.py index 5200d76b..c0bb61eb 100644 --- a/apps/file/models.py +++ b/apps/file/models.py @@ -22,7 +22,7 @@ PURPOSES = ( ('scheme teritory', _(u'Схема територии')), ('diplom', _(u'Дипломы')), ('preview', _(u'Превью')), - ('preview2', _(u'Превью')), + ('preview2', _(u'Превью 2')), )