From 257dd6e2de01169a8c9db500d8487d0d066af176 Mon Sep 17 00:00:00 2001 From: Slava Kyrachevsky Date: Wed, 25 Jan 2017 12:30:57 +0200 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5=20=D0=B2=20=D0=B0=D0=B4=D0=BC?= =?UTF-8?q?=D0=B8=D0=BD=D0=BA=D0=B5=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BC=D1=83=D0=BB=D1=8C=D1=82=D0=B8=D0=B7=D0=B0=D0=B3=D1=80?= =?UTF-8?q?=D1=83=D0=BA=D0=B8=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/conference/admin.py | 7 +-- apps/exposition/admin.py | 7 +-- apps/file/models.py | 5 ++- apps/organiser/admin.py | 7 +-- apps/place_conference/admin.py | 4 -- apps/place_exposition/admin.py | 5 +-- proj/admin.py | 31 +++++++------ static/jQuery-filer/js/init.js | 7 +-- templates/c_admin/includes/photo_form.html | 43 ------------------- templates/c_admin/includes/photogallery.html | 5 +-- .../place_conference/place_conference.html | 1 - .../place_exposition/place_exposition.html | 1 - 12 files changed, 30 insertions(+), 93 deletions(-) delete mode 100644 templates/c_admin/includes/photo_form.html diff --git a/apps/conference/admin.py b/apps/conference/admin.py index 00309bb7..3d4e3af7 100644 --- a/apps/conference/admin.py +++ b/apps/conference/admin.py @@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required from django.contrib.contenttypes.models import ContentType from django.core.context_processors import csrf from django.db import models -from django.forms.formsets import BaseFormSet, formset_factory +from django.forms.formsets import formset_factory from django.forms.models import modelformset_factory from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response @@ -36,15 +36,13 @@ from forms import ( from functions.admin_views import ( AdminListView, AdminView, - stat_paginate_results, - # upload_photo + stat_paginate_results ) from functions.custom_views import delete_object, objects_list from functions.views_help import get_referer from functions.admin import DefaultAdmin from haystack.query import SearchQuerySet from models import Conference, Statistic, TimeTable, Speaker -from photologue.forms import PhotoForm from photologue.admin import upload_photo from theme.models import Tag @@ -337,7 +335,6 @@ class ConferenceView(AdminView): files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) context['files'] = files - context['photo_form'] = PhotoForm() context['timetable_form'] = TimeTableForm() context['timetables'] = TimeTable.objects.filter(conference=obj) return context diff --git a/apps/exposition/admin.py b/apps/exposition/admin.py index 181d1749..390bb603 100644 --- a/apps/exposition/admin.py +++ b/apps/exposition/admin.py @@ -8,7 +8,7 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.contenttypes.models import ContentType from django.core.context_processors import csrf -from django.forms.formsets import BaseFormSet, formset_factory +from django.forms.formsets import formset_factory from django.forms.models import modelformset_factory from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response @@ -26,14 +26,12 @@ from forms import ( from functions.admin_views import ( AdminListView, AdminView, - stat_paginate_results, - # upload_photo + stat_paginate_results ) from functions.custom_views import delete_object, objects_list from functions.views_help import get_referer from haystack.query import SearchQuerySet from models import Exposition, Statistic, TimeTable, TmpTimeTable -from photologue.forms import PhotoForm from photologue.admin import upload_photo from theme.models import Tag @@ -337,7 +335,6 @@ class ExpositionView(AdminView): files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) context['files'] = files - context['photo_form'] = PhotoForm() context['timetable_form'] = TimeTableForm() context['timetables'] = TimeTable.objects.filter(exposition=obj) return context diff --git a/apps/file/models.py b/apps/file/models.py index 3136b1bb..9b56c2c2 100644 --- a/apps/file/models.py +++ b/apps/file/models.py @@ -24,6 +24,7 @@ PURPOSES = (('photo', _(u'Фото')), ('preview2',_(u'Превью')), ) + class FileModel(TranslatableModel): """ Create FileModel model @@ -43,9 +44,9 @@ class FileModel(TranslatableModel): """ type = filename.split('.')[-1] if type.upper() in IMG_TYPES: - return 'imgs/%s'%filename + return 'imgs/%s' % filename else: - return 'files/%s'%filename + return 'files/%s' % filename content_type = models.ForeignKey(ContentType, null=True) #limit_choices_to={'model__in': ('Country', 'City')} object_id = models.PositiveIntegerField(blank=True, null=True) diff --git a/apps/organiser/admin.py b/apps/organiser/admin.py index dde1a9ce..69acd2f4 100644 --- a/apps/organiser/admin.py +++ b/apps/organiser/admin.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- from django.conf import settings -from photologue.forms import PhotoForm from models import Organiser from theme.models import Tag from forms import OrganiserForm, OrganiserFilterForm @@ -12,6 +11,7 @@ class OrganiserListView(AdminListView): form_class = OrganiserFilterForm model = Organiser + class OrganiserView(AdminView): form_class = OrganiserForm model = Organiser @@ -57,8 +57,3 @@ class OrganiserView(AdminView): return form else: return form_class() - - def get_context_data(self, **kwargs): - context = super(OrganiserView, self).get_context_data(**kwargs) - context['photo_form'] = PhotoForm() - return context diff --git a/apps/place_conference/admin.py b/apps/place_conference/admin.py index fc609033..fbb8db65 100644 --- a/apps/place_conference/admin.py +++ b/apps/place_conference/admin.py @@ -189,7 +189,6 @@ def conference_change(request, url): return render_to_response('place_conference_add.html', args) -from photologue.forms import PhotoForm from functions.admin_views import AdminView from file.forms import FileModelForm, FileForm class PlaceConferenceView(AdminView): @@ -241,9 +240,6 @@ class PlaceConferenceView(AdminView): context['file_form'] = FileForm(initial={'model': 'place_conference.PlaceConference'}) files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) context['files'] = files - - context['photo_form'] = PhotoForm() - return context class PlaceConferenceListView(AdminListView): diff --git a/apps/place_exposition/admin.py b/apps/place_exposition/admin.py index 09b6b724..2f642177 100644 --- a/apps/place_exposition/admin.py +++ b/apps/place_exposition/admin.py @@ -16,7 +16,7 @@ from django.views.decorators.csrf import csrf_exempt from haystack.query import SearchQuerySet from functions.custom_views import objects_list, delete_object from functions.views_help import get_referer -from functions.admin_views import AdminView, AdminListView # , upload_photo, FormView +from functions.admin_views import AdminView, AdminListView from functions.http import JsonResponse from exposition.admin import get_by_lang @@ -25,7 +25,6 @@ from models import PlaceExposition, Hall from city.models import City from file.models import FileModel, TmpFile from file.forms import FileModelForm, FileForm -from photologue.forms import PhotoForm from photologue.admin import upload_photo from place_conference.models import PlaceConference from place_exposition.models import PlaceExposition @@ -257,8 +256,6 @@ class PlaceExpositionView(AdminView): context['halls'] = list(Hall.objects.language().filter(place_exposition=self.obj)) context['hall_form'] = HallForm() - context['photo_form'] = PhotoForm() - return context def add_hall(request, place_id): diff --git a/proj/admin.py b/proj/admin.py index 8aa44aac..ab30f420 100644 --- a/proj/admin.py +++ b/proj/admin.py @@ -108,28 +108,35 @@ def ajax_post_file(request, obj_id=None): Returns 'file_list.html' template with existing files if id != None. """ - if request.POST: + if request.method == 'POST': if not obj_id: raise Http404 file_form = FileForm(request.POST, request.FILES) if file_form.is_valid(): - #takes data from hidden input "model" and initial Model - Model = get_model(request.POST['model'].split('.')[0], request.POST['model'].split('.')[1]) - #initial model object + # takes data from hidden input "model" and initial Model + Model = get_model(request.POST['model'].split('.')[0], + request.POST['model'].split('.')[1]) + # initial model object obj = Model.objects.get(id=obj_id) - file = file_form.save(request.FILES, obj) + file_form.save(request.FILES, obj) - files = FileModel.objects.filter(content_type=ContentType.objects.get_for_model(obj),object_id=getattr(obj, 'id')) + files = FileModel.objects.filter( + content_type=ContentType.objects.get_for_model(obj), + object_id=getattr(obj, 'id') + ) - return render_to_response('file_list.html', {'files' : files}) + return render_to_response( + 'c_admin/file_list.html', {'files': files} + ) else: - args = {} + args = { + 'languages': settings.LANGUAGES, + 'file_form': file_form, + 'obj_id': obj_id + } - args['languages'] = settings.LANGUAGES - args['file_form'] = file_form - args['obj_id'] = obj_id args.update(csrf(request)) - return render_to_response('ajax_error_form.html', args) + return render_to_response('c_admin/ajax_error_form.html', args) else: raise Http404 diff --git a/static/jQuery-filer/js/init.js b/static/jQuery-filer/js/init.js index 4b2b3a65..6d88f60d 100644 --- a/static/jQuery-filer/js/init.js +++ b/static/jQuery-filer/js/init.js @@ -124,7 +124,6 @@ function init_filer($target) { onRemove: function(itemEl, file, id, listEl, boxEl, newInputEl, inputEl){ var filerKit = inputEl.prop("jFiler"), file_name = filerKit.files_list[id].name; - console.log(itemEl); $.get(itemEl.find('.jFiler-item-trash-action').attr('href')) }, @@ -159,9 +158,5 @@ function init_filer($target) { var $uploaders = $('.file_upload_container'); $uploaders.each(function (i, uploader) { - var $uploader = $(uploader), - fields = $uploader.data('fields').split('|'), // Массив названий полей для создания фото - languages = $uploader.data('languages').split('|'); // Массив языков, будет использоватся для генерации инпутов - - init_filer($uploader); + init_filer($(uploader)); }); diff --git a/templates/c_admin/includes/photo_form.html b/templates/c_admin/includes/photo_form.html deleted file mode 100644 index bce57afd..00000000 --- a/templates/c_admin/includes/photo_form.html +++ /dev/null @@ -1,43 +0,0 @@ - diff --git a/templates/c_admin/includes/photogallery.html b/templates/c_admin/includes/photogallery.html index db816201..6563b1b4 100644 --- a/templates/c_admin/includes/photogallery.html +++ b/templates/c_admin/includes/photogallery.html @@ -7,10 +7,7 @@
{% if object %}
+ data-upload-url="{{ object.upload_photo_url }}">
diff --git a/templates/c_admin/place_conference/place_conference.html b/templates/c_admin/place_conference/place_conference.html index 1f37bb71..d3c7d33f 100644 --- a/templates/c_admin/place_conference/place_conference.html +++ b/templates/c_admin/place_conference/place_conference.html @@ -333,7 +333,6 @@ {% include 'c_admin/includes/hall_form.html' with form=hall_form object=object %} -{% include 'c_admin/includes/photo_form.html' with form=photo_form object=object %} {% include 'c_admin/includes/file_form.html' with file_form=file_form object=object %} {% endblock %} diff --git a/templates/c_admin/place_exposition/place_exposition.html b/templates/c_admin/place_exposition/place_exposition.html index a7a62788..ca08d987 100644 --- a/templates/c_admin/place_exposition/place_exposition.html +++ b/templates/c_admin/place_exposition/place_exposition.html @@ -393,7 +393,6 @@ {% include 'c_admin/includes/hall_form.html' with form=hall_form object=object %} -{% include 'c_admin/includes/photo_form.html' with form=photo_form object=object %} {% include 'c_admin/includes/file_form.html' with file_form=file_form object=object %} {% endblock %}