Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-09 20:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	stock/templates/registered/hrapplicationview.html
This commit is contained in:
Adarnof 2016-03-08 18:27:03 +00:00
commit 0f66707631
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hrapplications/views.py
View File

@ -153,7 +153,10 @@ def hr_application_view(request, app_id):
context = {
'application': application,
'comments': comments, 'comment_form': form}
'comments': comments,
'comment_form': form,
'apis': application.user.eveapikeypair_set.all(),
}
return render_to_response('registered/hrapplicationview.html',
context, context_instance=RequestContext(request))

2
stock/templates/registered/hrapplicationview.html
View File

@ -146,7 +146,7 @@
<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 }}"
<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>