Bugfix

projects/templates/project_detail.html

@@ -128,7 +128,7 @@
                                 </div>
                             </div>
                         {% endif %}
-                    {% elif request.user.is_customer %}
+                    {% elif request.user.is_customer and request.user == project.customer %}
                         <a href="{% url 'projects:customer-project-edit' pk=project.pk %}?back={{ request.path }}" class="linkProIn linkProIn1">
                             Редактировать
                         </a>
@@ -245,7 +245,7 @@
                                 <p>Опубликован: {{ answer.created|date:'M d, Y' }}</p>
                             </div>
                             <div class="col-lg-3 retts">
-                                <form action="{% url 'projects:contractor-reject-project-answer' pk=answer.pk %}" method="POST" novalidate>
+                                <form action="{% url 'projects:reject-project-answer' pk=answer.pk %}" method="POST" novalidate>
                                     {% csrf_token %}
                                     <input type="hidden" name="next" value="{{ request.path }}">
                                     <a href="#" onclick="$(this).closest('form').submit(); return false" class="candLink candLink3">отказ</a>
@@ -490,7 +490,7 @@
                                 Кандидаты  <span>{{ project|get_candidate_answers|length }}</span>
                             </a>
                             <a href="#rejected-answers" data-toggle="tab" class="btn btn-default">
-                                Отказал  <span>{{ project|get_rejected_answers|length }}</span>
+                                Отказы  <span>{{ project|get_rejected_answers|length }}</span>
                             </a>
                         </div>
                     </div>
@@ -823,7 +823,7 @@
                         
                         <div id="rejected-answers" class="tab-pane fade">
                             <div class="col-lg-12 exNew">
-                                <p>Отказал</p>
+                                <p>Отказы</p>
                             </div>
                             
                             

projects/views.py

@@ -54,7 +54,7 @@ class ProjectDetailWithAnswerView(BaseMixin, View):
         HitCountMixin.hit_count(request, hit_count)
         
         if request.user.is_authenticated() and request.user.is_contractor():
-            project_answers = project.answers.all()
+            project_answers = project.answers.filter(rejected=False)
             contractor = request.user
             
             answer = _.first(_.filter(project_answers, lambda a: a.author == contractor))