diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 1752865..91bb37f 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -128,7 +128,7 @@ {% endif %} - {% elif request.user.is_customer %} + {% elif request.user.is_customer and request.user == project.customer %} Редактировать @@ -245,7 +245,7 @@

Опубликован: {{ answer.created|date:'M d, Y' }}

-
+ {% csrf_token %} отказ @@ -490,7 +490,7 @@ Кандидаты {{ project|get_candidate_answers|length }} - Отказал {{ project|get_rejected_answers|length }} + Отказы {{ project|get_rejected_answers|length }}
@@ -823,7 +823,7 @@
-

Отказал

+

Отказы

diff --git a/projects/views.py b/projects/views.py index 409e5e5..207e525 100644 --- a/projects/views.py +++ b/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))