#ARC-14

archilance/management/commands/generate_projects.py

@@ -70,7 +70,7 @@ class Command(BaseCommand):
             
             project.specialization = Specialization.objects.root_nodes()[0].get_descendants().order_by('?').first()
             project.realty = Realty.objects.order_by('?').first()
-            project.customer = User.objects.filter(groups__name='Заказчики', is_active=True, is_superuser=False).order_by('?').first()
+            project.customer = User.customer_objects.filter(is_active=True).order_by('?').first()
             
             project.save()
             

projects/templates/project_detail.html

@@ -1,6 +1,5 @@
 {% extends 'partials/base.html' %}
 
-{% load staticfiles %}
 {% load humanize %}
 
 
@@ -18,9 +17,11 @@
 					<p>{{ project.budget|intcomma }} <i class="fa fa-rub"></i></p>
 				</div>
 				<div class="col-lg-4">
-					<a href="#" class="aLinkExe"><div class="imgExecutor">
+					<a href="#" class="aLinkExe">
+                        <div class="imgExecutor">
                             <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
-					</div></a>
+                        </div>
+					</a>
 					<p class="nameExecutor">
 						<a href="#">{{ project.customer.get_full_name }} [{{ project.customer }}]</a>
 					</p>
@@ -47,7 +48,6 @@
 						<div class="insetSpec">
 							<span>Интерьеры</span>
 						</div>
-
 						<div class="insetSpec">
 							<span>Визуализация/3D</span>
 						</div>
@@ -104,11 +104,11 @@
 
 
                 <form action="{% url 'projects:contractor-project-answer' pk=pk %}" method="POST">
-                <input type="hidden" name="next" value="{% url 'projects:detail' pk=pk %}">
-                {{ form.errors }}
                     {% csrf_token %}
-                <div class="polsF1 disTab">
                     
+                    <input type="hidden" name="next" value="{% url 'projects:detail' pk=pk %}">
+                    
+                    <div class="polsF1 disTab">
                         <div class="col-lg-3">
                             <div class="textAreaBlock2 text-nn box-sizing disTab">
                                 <p>Стоимость</p>
@@ -167,7 +167,6 @@
                     <div class="polsF1 disTab">
                         <div class="col-lg-3"><input type="submit" value="Создать"/></div>
                     </div>
-
                 </form>
 			</div>
 			<div class="candidateBlock disTab">
@@ -200,7 +199,6 @@
                                     <p>Есть допуск СРО</p>
                                 </div>
                             {% endif %}
-
                         </div>
                         <div class="col-lg-2 listCens">
                             <p>Цена:

projects/templates/project_filter.html

@@ -13,7 +13,7 @@
             
             <form action="{% url 'projects:project-filter' %}" method="GET" novalidate>
                 <div class="col-lg-12">
-                    --<div class="filter clearfix">
+                    <div class="filter clearfix">
                         <div class="triangle1"></div>
                         
                         

projects/views.py

@@ -155,6 +155,8 @@ class ProjectView(BaseMixin, View):
         context = self.get_context_data(**_.merge({}, request.GET, kwargs))
         context.update({'project': project})
         
+        # import code; code.interact(local=dict(globals(), **locals()))
+        
         if request.user.is_authenticated() and request.user.is_customer():
             return render(request, self.customer_template_name, context)
         else: