From 850a028a20c1c09a92861b24c7c007e67e4fc599 Mon Sep 17 00:00:00 2001
From: booblegum <booblegum42@gmail.com>
Date: Wed, 28 Dec 2016 15:12:26 +0300
Subject: [PATCH] =?UTF-8?q?PR-62=20=D0=9C=D0=BE=D0=B4=D0=B8=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D1=8F=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B?=
 =?UTF-8?q?=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=BE=D1=80=D1=82=D1=84=D0=BE=D0=BB=D0=B8=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Создание и редактирование портфолио в одной(новой) форме
---
 projects/templates/portfolio_create_edit.html | 28 ++++---
 projects/views.py                             | 76 +++++++------------
 2 files changed, 44 insertions(+), 60 deletions(-)

diff --git a/projects/templates/portfolio_create_edit.html b/projects/templates/portfolio_create_edit.html
index 008cf76..c05446d 100644
--- a/projects/templates/portfolio_create_edit.html
+++ b/projects/templates/portfolio_create_edit.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load staticfiles %}
 {% load sass_tags %}
+{% load thumbnail %}
 {% block personal_css %}
     <link rel='stylesheet' href='{% sass_src "sass/components/custom-components.sass" %}'>
     <link rel='stylesheet' href='{% sass_src "lib/proekton-components/sass/components.sass" %}'>
@@ -113,20 +114,23 @@
                                     </div>
                                     <span style="display: inline-block;vertical-align: inherit;">ДО 100 ФАЙЛОВ</span>
                                 </div>
-                                {% for image in form.photos.field.queryset.all %}
-                                    <input type="hidden" name="files" class="file-upload-input"
-                                    <div class="col-lg-3 file-upload-widget" style="display: none">
-                                        <div class="preview-container">
-                                            <div class="btn close file-upload-remove-img-btn">&times;</div>
-                                            <div class="preview">
-                                                <img src="{{ image.img.url }}">
-                                            </div>
-                                        </div>
-                                        <span style="display:none" class="file-upload-label"></span>
 
-                                    </div>
-                                {% endfor %}
                                 <div class="row list-new-new" style="margin-top: 10px">
+                                    {% for image in form.photos.field.queryset.all %}
+
+                                        <div class="col-lg-3 file-upload-widget">
+                                            <input type="hidden" name="photos" class="file-upload-input" value="{{ image.pk }}">
+                                            <div class="preview-container">
+                                                <div class="btn close file-upload-remove-img-btn">&times;</div>
+                                                <div class="preview">
+                                                    {% thumbnail image.img "250x200" crop="center" as im %}
+                                                        <img src="{{ im.url }}">
+                                                    {% endthumbnail %}
+                                                </div>
+                                            </div>
+                                            {#                                        <span style="display:none" class="file-upload-label"></span>#}
+                                        </div>
+                                    {% endfor %}
                                     <div class="col-lg-3 file-upload-widget" style="display: none">
                                         <input type="file" name="new_files" class="file-upload-input"
                                                style="position: absolute; top: -1000px; left: -1000px">
diff --git a/projects/views.py b/projects/views.py
index e7fcd1a..c97de14 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -572,8 +572,8 @@ class CustomerProjectEditView(BaseMixin, View):
         if form.is_valid() and realty_form.is_valid():
             project = form.save(commit=False)
             project.customer = request.user
-            project.files = form.cleaned_data.get(
-                'files')  # TODO: Should we somehow get rid of this explicit assignment?
+            # print("files = ", form.cleaned_data.get('files'))
+            project.files = form.cleaned_data.get('files')
             project.save()
             form.save_m2m()
 
@@ -938,7 +938,14 @@ class ContractorPortfolioEditView(BaseMixin, View):
     work_type_suggestion_form = ProjectWorkTypeSuggestionForm
     template_name = 'portfolio_create_edit.html'
 
+    def dispatch(self, request, *args, **kwargs):
+        if request.user.is_authenticated() and request.user.is_contractor():
+            return super().dispatch(request, *args, **kwargs)
+        else:
+            raise PermissionDenied
+
     def get(self, request, *args, **kwargs):
+        print("request.GET = ", request.GET)
         portfolio = get_object_or_404(Portfolio, pk=kwargs.get('pk'))
         form = self.form_class(instance=portfolio, request=request)
         work_type_suggestion_form = self.work_type_suggestion_form(request=request, prefix='work_type_suggestion')
@@ -953,60 +960,33 @@ class ContractorPortfolioEditView(BaseMixin, View):
         return render(request, self.template_name, context)
 
     def post(self, request, *args, **kwargs):
-        # print("request.POST = ", request.POST)
-        project = get_object_or_404(request.user.customer_projects, pk=kwargs.get('pk'))
-        form = self.form_class(request.POST, request.FILES, request=request, instance=project)
-
-        form.is_valid()
-        realty = form.cleaned_data.get('realty')
-
-        if realty:
-            realty_form = self.realty_form(request.POST, instance=realty, request=request, prefix='realty_form')
-        else:
-            realty_form = self.realty_form(request.POST, request=request, prefix='realty_form')
+        print("request.POST = ", request.POST)
+        portfolio = get_object_or_404(Portfolio, pk=kwargs.get('pk'))
+        form = self.form_class(request.POST, request.FILES, request=request, instance=portfolio)
 
-        if form.is_valid() and realty_form.is_valid():
-            project = form.save(commit=False)
-            project.customer = request.user
-            project.files = form.cleaned_data.get(
-                'files')  # TODO: Should we somehow get rid of this explicit assignment?
-            project.save()
+        if form.is_valid():
+            portfolio = form.save(commit=False)
+            portfolio.user = request.user
+            print("clean photos = ", form.cleaned_data.get('photos'))
+            portfolio.photos = form.cleaned_data.get('photos')
+            portfolio.save()
             form.save_m2m()
 
             for file in request.FILES.getlist('new_files'):
-                ProjectFile.objects.create(file=file, project=project)
-
-            if not realty:
-                realty = realty_form.save(commit=False)
-                realty.user = request.user
-                if not request.POST.get('new_realty_name'):
-                    realty.is_virtual = True
-                realty.name = request.POST.get('new_realty_name')
-                realty.save()
-                realty_form.save_m2m()
-
-                project.realty = realty  # Connect a realty with a project
-                project.save()
+                PortfolioPhoto.objects.create(img=file, portfolio=portfolio)
 
-            messages.info(request, 'Проект успешно отредактирован')
-            # redirect_to = request.POST.get('back')
-            redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
+            messages.info(request, 'Портфолио успешно создано')
+            redirect_to = reverse('projects:contractor-portfolio-detail', kwargs={'pk': portfolio.pk})
+            if request.is_ajax():
+                return JsonResponse({'redirect_to': redirect_to}, status=200)
             return redirect(redirect_to)
         else:
-            if form.errors:
-                messages.info(request, (
-                    '<p>Произошла ошибка (form)</p>'
-                    '<pre>{form}</pre>'
-                ).format(form=pformat(form.errors)))
-
-            if realty_form and realty_form.errors:
-                messages.info(request, (
-                    '<p>Произошла ошибка (realty_form)</p>'
-                    '<pre>{realty_form}</pre>'
-                ).format(realty_form=pformat(realty_form.errors)))
-
             context = self.get_context_data(**kwargs)
-            context.update({'form': form, 'realty_form': realty_form})
+            context.update({'form': form})
+            if request.is_ajax():
+                data = json.dumps(form.errors)
+                print("form errors = ", data)
+                return HttpResponse(content=data, status=400, content_type='application/json')
             return render(request, self.template_name, context)