Corrected missing comment form

Updated permissions in readme
This commit is contained in:
Adarnof 2016-03-14 00:35:08 +00:00
parent ed11884a0b
commit 8d44980304
2 changed files with 32 additions and 30 deletions

View File

@ -74,12 +74,12 @@ Special Permissions In Admin:
auth | user | optimer_view ( Allows for an individual view fleet operations) auth | user | optimer_view ( Allows for an individual view fleet operations)
auth | user | logging_notifications ( Generate notifications from logging) auth | user | logging_notifications ( Generate notifications from logging)
auth | user | human_resources ( View applications to user's corp ) auth | user | human_resources ( View applications to user's corp )
hrapplications | hrapplication | delete_hrapplication ( Can delete applications ) hrapplications | application | delete_application ( Can delete applications )
hrapplications | hrapplication | accept_hrapplication ( Can accept applications ) hrapplications | application | accept_application ( Can accept applications )
hrapplications | hrapplication | reject_hrapplication ( Can reject applications ) hrapplications | application | reject_application ( Can reject applications )
hrapplications | hrapplication | view_apis ( Can see applicant's API keys ) hrapplications | application | view_apis ( Can see applicant's API keys )
hrapplicstions | hrapplicationcomment | add_hrapplicationcomment ( Can comment on applications ) hrapplicstions | applicationcomment | add_applicationcomment ( Can comment on applications )
Active Developers Active Developers

View File

@ -47,6 +47,9 @@
<a href="/hr_mark_in_progress/{{ app.id }}" class="btn btn-warning">Mark in Progress</a> <a href="/hr_mark_in_progress/{{ app.id }}" class="btn btn-warning">Mark in Progress</a>
{% endif %} {% endif %}
{% 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 %} {% if perms.hrapplications.view_apis %}
{% for api in 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> <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> </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 %}
{% endif %} {% endif %}
</div> </div>
</div> </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 %} {% endblock %}