From 8d4498030427484a3318b91c905bf0121fece8cc Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Mon, 14 Mar 2016 00:35:08 +0000
Subject: [PATCH] Corrected missing comment form Updated permissions in readme

---
 README.md                                     | 12 ++---
 .../registered/hrapplicationview.html         | 50 ++++++++++---------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 1057b3df..213c7e0d 100755
--- a/README.md
+++ b/README.md
@@ -74,12 +74,12 @@ Special Permissions In Admin:
     auth | user | optimer_view ( Allows for an individual view fleet operations)
     auth | user | logging_notifications ( Generate notifications from logging)
 
-    auth | user | human_resources ( View applications to user's corp )    
-    hrapplications | hrapplication | delete_hrapplication ( Can delete applications )
-    hrapplications | hrapplication | accept_hrapplication ( Can accept applications )
-    hrapplications | hrapplication | reject_hrapplication ( Can reject applications )
-    hrapplications | hrapplication | view_apis ( Can see applicant's API keys )
-    hrapplicstions | hrapplicationcomment | add_hrapplicationcomment ( Can comment on applications )
+    auth | user | human_resources ( View applications to user's corp )
+    hrapplications | application | delete_application ( Can delete applications )
+    hrapplications | application | accept_application ( Can accept applications )
+    hrapplications | application | reject_application ( Can reject applications )
+    hrapplications | application | view_apis ( Can see applicant's API keys )
+    hrapplicstions | applicationcomment | add_applicationcomment ( Can comment on applications )
 
 Active Developers
 
diff --git a/stock/templates/registered/hrapplicationview.html b/stock/templates/registered/hrapplicationview.html
index 59c4199b..e7246ddb 100644
--- a/stock/templates/registered/hrapplicationview.html
+++ b/stock/templates/registered/hrapplicationview.html
@@ -47,6 +47,9 @@
                                     <a href="/hr_mark_in_progress/{{ app.id }}" class="btn btn-warning">Mark in Progress</a>
                                 {% endif %}
                             {% endif %}
+                            {% if perms.hrapplications.add_applicationcomment %}
+                                <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#myModal">Comment</button>
+                            {% endif %}
                             {% if perms.hrapplications.view_apis %}
                                 {% for api in apis %}
                                     <a href="{{ JACK_KNIFE_URL }}?usid={{ api.api_id}}&apik={{ api.api_key }}" class="btn btn-info">API {{ api.api_id }}</a>
@@ -79,33 +82,32 @@
                                 </div>
                             </div>
                         </div>
-                        {% 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>
-                            </div>
-                        {% endif %}
                     {% endif %}
                 {% endif %}
             </div>
         </div>
     </div>
+{% 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>
+    </div>
+{% endif %}
 {% endblock %}