Merge branch 'hrapp' of https://github.com/R4stl1n/allianceauth into hrapp

Conflicts:
	stock/templates/registered/hrapplicationview.html
This commit is contained in:
Adarnof
2016-03-08 18:27:03 +00:00
2 changed files with 6 additions and 3 deletions

View File

@@ -146,8 +146,8 @@
<div class="row text-center">
{% if perms.hrapplications.view_apis %}
{% for api in apis %}
<a href="{{ JACK_KNIFE_URL }}?usid={{ api._api_id }}&apik={{ api.api__key }}"
target="_blank">
<a href="{{ JACK_KNIFE_URL }}?usid={{ api.api_id }}&apik={{ api.api_key }}"
target="_blank">
<button type="button" class="btn btn-lg btn-primary">API {{ api.api_id }}</button>
</a>
{% endfor %}