#ARC-12

common/templatetags/common_tags.py

@@ -1,20 +1,19 @@
 from django import template
 from pprint import pprint, pformat
+import os
 
 register = template.Library()
 
 
 @register.inclusion_tag('templatetags/inspect.html', takes_context=True)
 def inspect(context, obj):
-    return {
+    return {'obj': pformat(obj.__dict__)}
-        'obj': pformat(obj.__dict__),
+
-    }
 
 @register.inclusion_tag('templatetags/inspect.html', takes_context=True)
 def inspect2(context, obj):
-    return {
+    return {'obj': pformat(dir(obj))}
-        'obj': pformat(dir(obj)),
+
-    }
 
 @register.simple_tag
 def interact(**kwargs):
@@ -35,4 +34,10 @@ def to_str(val):
 def multiply(string, times):
     return string * times
 
+
+@register.filter('basename')
+def basename(val):
+    return os.path.basename(val)
+
+
 # import code; code.interact(local=dict(globals(), **locals()))

projects/templates/customer_project_edit.html

@@ -42,10 +42,12 @@
                             </div>
                             
                             <ul class="list-new-new">
-                                {% for file in ... %}
+                                {% for file in form.files.field.queryset.all %}
-                                    <li class="file-upload-widget">
+                                    <li class="f--ile-upload-widget">
-                                        <p class="file-upload-label">{{  }}</p>
+                                        <input type="checkbox" name="{{ form.budget.html_name }}" value="{{ file.pk }}" checked>
-                                        <div class="file-upload-remove-btn"></div>
+{#                                        <p class="file-upload-label">{{ file.file.name|basename }}</p>#}
+{#                                        <p class="file-upload-label">{{ file.pk }}</p>#}
+{#                                        <div class="file-upload-remove-btn"></div>#}
                                     </li>
                                 {% endfor %}
                                 

projects/views.py

@@ -123,114 +123,50 @@ class CustomerProjectCreateView(BaseMixin, View):
 
 
 class CustomerProjectEditView(BaseMixin, View):
-#     form_class = CustomerProjectEditForm
+    form_class = CustomerProjectEditForm
-#     template_name = 'customer_project_edit_test.html' # 'customer_project_edit.html'
+    realty_form = RealtyForm
-#     
+    template_name = 'customer_project_edit.html'
-#     def get(self, request, *args, **kwargs):
+    
-#         if request.user.is_authenticated():
+    def get(self, request, *args, **kwargs):
-#             project = get_object_or_404(request.user.projects, pk=kwargs.get('pk'))
+        if request.user.is_authenticated() and request.user.is_customer():
-#             form = self.form_class(instance=project, request=request)
+            project = get_object_or_404(request.user.projects, pk=kwargs.get('pk'))
-#             
+            form = self.form_class(instance=project, request=request)
-#             context = self.get_context_data(**_.merge({}, request.GET, kwargs))
+            
-#             context.update({'form': form})
+            realty = project.realty
-#             
+            
-#             return render(request, self.template_name, context)
+            if realty:
-#         else:
+                realty_form = self.realty_form(instance=project.realty, request=request, prefix='realty_form')
-#             return HttpResponseForbidden('403 Forbidden')
+            else:
-#     
+                realty_form = self.realty_form(request=request, prefix='realty_form')
-#     def post(self, request, *args, **kwargs):
+            
-#         if request.user.is_authenticated():
+            context = self.get_context_data(**_.merge({}, request.GET, kwargs))
-#             project = get_object_or_404(request.user.projects, pk=kwargs.get('pk'))
+            context.update({'form': form, 'realty_form': realty_form})
-#             form = self.form_class(_.merge({}, request.POST, kwargs), request=request, instance=project)
+            
-#             
+            return render(request, self.template_name, context)
-#             if form.is_valid():
+        else:
-#                 form.save()
+            return HttpResponseForbidden('403 Forbidden')
-#                 
+    
-#                 messages.info(request, 'Проект успешно отредактирован')
+    def post(self, request, *args, **kwargs):
-#                 redirect_to = request.POST.get('next')
+        if request.user.is_authenticated() and request.user.is_customer():
-#                 return redirect(redirect_to)
+            project = get_object_or_404(request.user.projects, pk=kwargs.get('pk'))
-#             else:
+            form = self.form_class(_.merge({}, request.POST, kwargs), request.FILES, request=request, instance=project)
-#                 context = self.get_context_data(**kwargs)
+            
-#                 context.update({'form': form})
+            if form.is_valid():
-#                 
+                # .....
-#                 messages.info(request, 'Произошла ошибка: <pre>{msg}</pre>'.format(msg=pformat(form.errors)))
+                #
-#                 return render(request, self.template_name, context)
+                # messages.info(request, 'Проект успешно отредактирован')
-#         else:
+                # redirect_to = request.POST.get('next')
-#             return HttpResponseForbidden('403 Forbidden')
+                # return redirect(redirect_to)
-    pass
+                
-
+                import code; code.interact(local=dict(globals(), **locals()))
-
+            else:
-# class CustomerProjectEditView(BaseMixin, View):
+                context = self.get_context_data(**kwargs)
-#     form_class = CustomerProjectEditForm
+                context.update({'form': form})
-#     realty_form = RealtyForm
+                
-#     template_name = 'customer_project_edit.html'
+                messages.info(request, 'Произошла ошибка: <pre>{msg}</pre>'.format(msg=pformat(form.errors)))
-#     
+                return render(request, self.template_name, context)
-#     def get(self, request, *args, **kwargs):
+        else:
-#         if request.user.is_authenticated() and request.user.is_customer():
+            return HttpResponseForbidden('403 Forbidden')
-#             form = self.form_class(request=request)
-#             realty_form = self.realty_form(request=request, prefix='realty_form')
-#             
-#             context = self.get_context_data(**_.merge({}, request.GET, kwargs))
-#             context.update({'form': form, 'realty_form': realty_form})
-#             
-#             return render(request, self.template_name, context)
-#         else:
-#             return HttpResponseForbidden('403 Forbidden')
-#     
-#     def post(self, request, *args, **kwargs):
-#         if request.user.is_authenticated() and request.user.is_customer():
-#             form = self.form_class(request.POST, request.FILES, request=request)
-#             
-#             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')
-#             
-#             if form.is_valid() and realty_form.is_valid():
-#                 project = form.save(commit=False)
-#                 project.customer = request.user
-#                 project.save()
-#                 form.save_m2m()
-#                 
-#                 for file in request.FILES.getlist('files'):
-#                     proj_file = ProjectFile.objects.create(file=file, project=project)
-#                     proj_file.save()
-#                 
-#                 if realty:
-#                     realty_form.save()
-#                 else:
-#                     realty = realty_form.save(commit=False)
-#                     realty.user = request.user
-#                     realty.save()
-#                     realty_form.save_m2m()
-#                     
-#                     project.realty = realty # Connect a realty with a project
-#                     project.save()
-#                 
-#                 messages.info(request, 'Проект успешно создан')
-#                 redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
-#                 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})
-#                 return render(request, self.template_name, context)
-#         else:
-#             return HttpResponseForbidden('403 Forbidden')
 
 
 class ContractorProjectAnswerView(BaseMixin, View):