Merge branch 'redundant-sql' into 'master'

Use existing character variable on dashboard.

See merge request allianceauth/allianceauth!1202
This commit is contained in:
Ariel Rin 2020-05-18 01:02:08 +00:00
commit be720d0e0f

View File

@ -141,19 +141,17 @@
</table> </table>
<table class="table table-aa visible-xs-block" style="width: 100%"> <table class="table table-aa visible-xs-block" style="width: 100%">
<tbody> <tbody>
{% for ownership in request.user.character_ownerships.all %} {% for char in characters %}
{% with ownership.character as char %} <tr>
<tr> <td class="text-center" style="vertical-align: middle">
<td class="text-center" style="vertical-align: middle"> <img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}">
<img class="ra-avatar img-circle" src="{{ char.portrait_url_32 }}"> </td>
</td> <td class="text-center" style="vertical-align: middle; width: 100%">
<td class="text-center" style="vertical-align: middle; width: 100%"> <strong>{{ char.character_name }}</strong><br>
<strong>{{ char.character_name }}</strong><br> {{ char.corporation_name }}<br>
{{ char.corporation_name }}<br> {{ char.alliance_name|default:"" }}
{{ char.alliance_name|default:"" }} </td>
</td> </tr>
</tr>
{% endwith %}
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>