Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-07 23:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct corputils permission handling around API display.

Browse Source 
Now allows users with corp_apis permission to see some APIs when searching, if result is in corp.
Correct type mismatch when determining if user with corp_apis can see member list.
Correctly pull EveWho memberlist in corp mode when API missing from settings.py
Closes #552
This commit is contained in:
Adarnof
2016-10-26 01:02:35 +00:00
parent f9dd03dc0f
commit 4ea7fdeaf2
2 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stock/templates/registered/corputilssearchview.html
View File

@@ -10,11 +10,9 @@
{% block content %}
<div class="col-lg-12">
{% if perms.auth.corputils %}
<h1 class="page-header text-center">{% trans "Member Search Results" %}
</h1>
<h2 class="text-center"><a href="{% url 'auth_corputils_corp_view' corp.corporation_id %}">{{ corp.corporation_name }}</a></h2>
<div class="container-fluid">
<h1 class="page-header text-center">{% trans "Member Search Results" %}</h1>
<h2 class="text-center"><a href="{% url 'auth_corputils_corp_view' corp.corporation_id %}">{{ corp.corporation_name }}</a></h2>
<div class="container-fluid">
<div class="panel panel-default">
<nav class="navbar navbar-default">
@@ -43,7 +41,7 @@
<th class="col-md-2">{% trans "Fleet statistics" %}</th>
{% else %}
<th class="col-md-5">{% trans "Killboard" %}</th>
{% endif %}
{% endif %}
<th class="col-md-2">{% trans "API JackKnife" %}</th>
</tr>
{% for result in results %}
@@ -53,7 +51,7 @@
</td>
<td>{{ result.name }}</td>
<td>
{% if result.api_registered%}
{% if result.api_registered%}
{{ result.main.character_name }}
{% else %}
<span class="label label-danger">{% trans "No API registered!" %}</span>
@@ -91,6 +89,5 @@
</div>
</div>
</div>
{% endif %}
</div>
{% endblock content %}