#PR-30 Исправление ссылок

assets/css/extra.css

@@ -279,3 +279,28 @@ li a:active .count-tab, li a:hover .count-tab {
     float: none;
     margin: 20px auto;
 }
+
+
+
+.open-projects-div ul li:first-child:before {
+    height: 26px;
+    background-size: cover;
+    background-position: 0 0;
+}
+
+.open-projects-div li:last-child:before {
+    content: '';
+    position: absolute;
+    width: 21px;
+    height: 21px;
+    background-size: cover !important;
+    left: -39px;
+    top: -3px;
+}
+.open-projects-div ul li:before {
+    content: '';
+    position: absolute;
+    width: 21px;
+    left: -39px;
+    top: -3px;
+}

projects/views.py

@@ -483,7 +483,7 @@ class CustomerProjectEditView(BaseMixin, View):
             project = get_object_or_404(request.user.customer_projects, pk=kwargs.get('pk'))
 
             if project.order.contractor or project.order.team:
-                raise PermissionDenied('Заказ уже находится в работе')
+                raise PermissionDenied('Заказ уже находится в работе. Вы не можете его редактировать.')
             else:
                 return super().dispatch(request, *args, **kwargs)
 
@@ -599,9 +599,16 @@ class CustomerProjectTrashView(View):
 
     def dispatch(self, request, *args, **kwargs):
         if request.user.is_authenticated() and request.user.is_customer():
-            return super().dispatch(request, *args, **kwargs)
+            # Prevent editing when project's taken:
-        else:
+
-            raise PermissionDenied
+            project = get_object_or_404(request.user.customer_projects, pk=kwargs.get('pk'))
+
+            if project.order.contractor or project.order.team:
+                raise PermissionDenied('Заказ уже находится в работе. Вы не можете его переместить в корзину.')
+            else:
+                return super().dispatch(request, *args, **kwargs)
+
+        raise PermissionDenied
 
     def post(self, req, *args, **kwargs):
         form = self.form_class(_.merge({}, req.POST, kwargs), req=req)

users/templates/customer_profile_current_projects.html

@@ -1,15 +1,15 @@
 {% extends 'partials/base.html' %}
 
 {% load project_tags %}
- 
+
- 
+
 {% block content %}
     {% include 'partials/header.html' %}
-    
+
-	<div class="container mainScore mainBlock2">
+    <div class="container mainScore mainBlock2">
-		<div class="row">
+        <div class="row">
-			{% include 'partials/customer_profile_info_block.html' %}
+            {% include 'partials/customer_profile_info_block.html' %}
-			
+
             <div class="projectsBlock new-pro-block disTab">
                 {% for proj in projects %}
                     <div class="projectPro clearfix">
@@ -17,54 +17,73 @@
                             <p class="titlePro">
                                 <a href="{% url 'projects:detail' proj.pk %}">{{ proj.name }}</a>
                             </p>
-                            
+
                             <ul class="desPro">
                                 <li>Объект "{{ proj.realty.name }}"</li>
                                 <li><span>{{ proj.get_team_answers|length }}</span> ответ от имени группы</li>
                             </ul>
-                            
+
                             {% if request.user == customer %}
                                 <ul class="color-menu">
-                                    <li><a href="{% url 'projects:detail' proj.pk %}#new-answers">Новые: {{ proj|get_new_answers|length }}</a></li>
+                                    <li>
-                                    <li><a href="{% url 'projects:detail' proj.pk %}#candidate-answers">Кандидаты: {{ proj|get_candidate_answers|length }}</a></li>
+                                        <a href="{% url 'projects:detail' proj.pk %}#new-answers">Новые: {{ proj|get_new_answers|length }}</a>
-                                    <li><a href="{% url 'projects:detail' proj.pk %}#rejected-answers">Отказал: {{ proj|get_rejected_answers|length }}</a></li>
+                                    </li>
+                                    <li>
+                                        <a href="{% url 'projects:detail' proj.pk %}#candidate-answers">Кандидаты: {{ proj|get_candidate_answers|length }}</a>
+                                    </li>
+                                    <li>
+                                        <a href="{% url 'projects:detail' proj.pk %}#rejected-answers">Отказал: {{ proj|get_rejected_answers|length }}</a>
+                                    </li>
                                 </ul>
                             {% endif %}
-                            
+
                             <p class="textPro">
                                 {{ proj.text }}
                             </p>
-                            
+
                             <ul class="listPro">
-                                <li>{{ proj.created}}</li>
+                                <li>{{ proj.created }}</li>
                                 <li>{{ proj.hit_count.hits }}</li>
                                 <li>{{ proj.answers.count }}</li>
                                 <li>{{ customer.get_full_name }}</li>
                             </ul>
                         </div>
-                        
+
                         <div class="col-lg-3 rightPro right-pro-red">
                             <p class="cenaPro">
                                 {{ proj.budget }} <i class="{% fa_currency_classes proj.currency %}"></i>
                             </p>
-                            
+
                             {% if request.user == proj.customer %}
-                                <ul>
+                                <div class="open-projects-div1">
+                                    <ul>
+                                        <li>
+                                            <a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a>
+                                        </li>
+
                                     <li>
-                                        <a href='{% url 'projects:customer-project-edit' pk=proj.pk %}?back={{ request.path }}'>Редактировать</a>
+                                        <form action="{% url 'projects:customer-project-trash' pk=proj.pk %}" method="POST" novalidate>
+                                            {% csrf_token %}
+                                            <input type="hidden" name="next" value="{{ request.path }}">
+                                            <a href="#" onclick="$(this).closest('form').submit(); return false">Переместить в корзину</a>
+                                        </form>
                                     </li>
-                                </ul>
+
+                                    </ul>
+                                </div>
+
+
                             {% endif %}
                         </div>
                     </div>
                 {% endfor %}
             </div>
-            
+
             <div class="col-lg-12 pagin">
-                {% include 'partials/pagination.html' %}	
+                {% include 'partials/pagination.html' %}
             </div>
-            
+
-			{% include 'partials/footer.html' %}
+            {% include 'partials/footer.html' %}
         </div>
     </div>
 {% endblock %}