From ed11884a0b1bb05376b8b01a9fae358441bf8b46 Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Sun, 13 Mar 2016 21:59:54 +0000
Subject: [PATCH] Correctly display comments still unable to make comment form
 render

---
 hrapplications/views.py                       |  4 +-
 .../registered/hrapplicationview.html         | 48 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/hrapplications/views.py b/hrapplications/views.py
index b2ba8b93..a1e6ede4 100755
--- a/hrapplications/views.py
+++ b/hrapplications/views.py
@@ -83,7 +83,7 @@ def hr_application_personal_view(request, app_id):
             'responses': ApplicationResponse.objects.filter(application=app),
             'buttons': False,
             'comments': ApplicationComment.objects.filter(application=app),
-            'form': None,
+            'comment_form': None,
             'apis': [],
         }
         return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request))
@@ -133,7 +133,7 @@ def hr_application_view(request, app_id):
         'buttons': True,
         'apis': app.apis,
         'comments': ApplicationComment.objects.filter(application=app),
-        'form': form,
+        'comment_form': form,
     }
     return render_to_response('registered/hrapplicationview.html', context, context_instance=RequestContext(request))
 
diff --git a/stock/templates/registered/hrapplicationview.html b/stock/templates/registered/hrapplicationview.html
index 45dc5f4a..59c4199b 100644
--- a/stock/templates/registered/hrapplicationview.html
+++ b/stock/templates/registered/hrapplicationview.html
@@ -70,37 +70,39 @@
                                         {% for comment in comments %}
                                             <div class="panel panel-default">
                                                 <div class="panel-heading" role="tab" id="">
-                                                    <div class="panel-title">{{comment.created_on}} - {{ comment.user }}</div>
+                                                    <div class="panel-title">{{comment.created}} - {{ comment.user }}</div>
                                                 </div>
-                                                <div class="panel-body">{{ comment.comment }}</div>
+                                                <div class="panel-body">{{ comment.text }}</div>
                                             </div>
                                         {% endfor %}
                                     </div>
                                 </div>
                             </div>
                         </div>
-                        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-                            aria-hidden="true">
-                            <div class="modal-dialog">
-                                <div class="modal-content">
-                                    <div class="modal-header">
-                                        <button type="button" class="close" data-dismiss="modal"><span
-                                            aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                                        <h4 class="modal-title" id="myModalLabel">Add Comment</h4>
+                        {% if perms.hrapplications.add_applicationcomment %}
+                            <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+                                aria-hidden="true">
+                                <div class="modal-dialog">
+                                    <div class="modal-content">
+                                        <div class="modal-header">
+                                            <button type="button" class="close" data-dismiss="modal"><span
+                                                aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                                                <h4 class="modal-title" id="myModalLabel">Add Comment</h4>
+                                        </div>
+                                        <div class="modal-body">
+                                            <form class="form-signin" role="form" action="" method="POST">
+                                                {% csrf_token %}
+                                                {{ comment_form|bootstrap }}
+                                                <br/>
+                                                <button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button>
+                                            </form>
+                                        </div>
+                                        <div class="modal-footer">
+                                        </div>
                                     </div>
-                                    <div class="modal-body">
-                                        <form class="form-signin" role="form" action="" method="POST">
-                                            {% csrf_token %}
-                                            {{ form|bootstrap }}
-                                           <br/>
-                                           <button class="btn btn-lg btn-primary btn-block" type="submit">Add Comment</button>
-                                       </form>
-                                   </div>
-                                   <div class="modal-footer">
-                                   </div>
-                               </div>
-                           </div>
-                        </div>
+                                </div>
+                            </div>
+                        {% endif %}
                     {% endif %}
                 {% endif %}
             </div>