From d76e0ce33f9e8276e43d28c291bae02d15ea4f21 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Fri, 23 Sep 2016 20:21:32 +0300
Subject: [PATCH] Fixes

---
 projects/templates/project_detail.html | 8 ++++----
 projects/views.py                      | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html
index d503726..34c2429 100644
--- a/projects/templates/project_detail.html
+++ b/projects/templates/project_detail.html
@@ -339,7 +339,7 @@
                             
                             
                             
-                            <div class="commBlock44 disTab">
+                            <div id="contractor-answers" class="commBlock44 disTab">
                                 {% for message in answer.messages.all %}
                                     <div class="comm44 disTab">
                                         <div class="col-lg-10 col-lg-offset-1 {% if not message.is_sender_customer %}-highlighted-message{% endif %}">
@@ -372,7 +372,7 @@
                                     <div class="col-lg-10 col-lg-offset-1">
                                         <form action="{% url 'projects:create-answer-message' pk=answer.pk %}" method="POST" novalidate>
                                             {% csrf_token %}
-                                            <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
+                                            <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}#contractor-answers">
                                             
                                             <div><textarea name="text" class="fr_answer"></textarea></div>
                                             <div><button type="submit" class="fr_answer_sen">Отправить</button></div>
@@ -755,7 +755,7 @@
                                                 <div class="col-lg-10 col-lg-offset-1">
                                                     <form action="{% url 'projects:create-answer-message' pk=answer.pk %}" method="POST" novalidate>
                                                         {% csrf_token %}
-                                                        <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
+                                                        <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}#new-answers">
                                                         
                                                         <div><textarea name="text" class="fr_answer"></textarea></div>
                                                         <div><button type="submit" class="fr_answer_sen">Отправить</button></div>
@@ -960,7 +960,7 @@
                                                 <div class="col-lg-10 col-lg-offset-1" style="padding:0;">
                                                     <form action="{% url 'projects:create-answer-message' pk=answer.pk %}" method="POST" novalidate>
                                                         {% csrf_token %}
-                                                        <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
+                                                        <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}#candidate-answers">
                                                         
                                                         <div><textarea style="margin-left:0;" name="text" class="fr_answer"></textarea></div>
                                                         <div><button style="margin-left:0;" type="submit" class="fr_answer_sen">Отправить</button></div>
diff --git a/projects/views.py b/projects/views.py
index 862a1a3..5bdfad0 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -175,13 +175,13 @@ class ProjectAnswerCreateMessageView(BaseMixin, View):
 
     def post(self, request, *args, **kwargs):
         form = self.form_class(request.POST, request=request)
+        
+        answer = get_object_or_404(Answer, pk=kwargs.get('pk'))
 
         if form.is_valid():
             message = form.save(commit=False)
 
             if request.user.is_contractor():
-                answer = get_object_or_404(Answer, pk=kwargs.get('pk'))
-
                 message.answer = answer
                 message.is_sender_customer = False
 
@@ -193,7 +193,6 @@ class ProjectAnswerCreateMessageView(BaseMixin, View):
                     if team and answer.author == team:
                         message.contractor_or_team = team
             elif request.user.is_customer():
-                answer = get_object_or_404(Answer, pk=kwargs.get('pk')) # TODO: Perform additional checks
                 message.answer = answer
                 message.is_sender_customer = True
 
@@ -207,7 +206,7 @@ class ProjectAnswerCreateMessageView(BaseMixin, View):
                     '<p>Произошла ошибка (form)</p>'
                     '<pre>{form}</pre>'
                 ).format(form=pformat(form.errors)))
-
+        
         redirect_to = request.POST.get('next')
         return redirect(redirect_to)