From 6430515d5ece8c04bb5dc99ef95da13020abb56a Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Tue, 19 Jul 2011 13:59:04 +0100 Subject: [PATCH] Split out corps into a seperate query, order by name and filter out 0 member corps --- app/eve_api/templates/eve_api/alliance.html | 6 +++--- app/eve_api/views.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/eve_api/templates/eve_api/alliance.html b/app/eve_api/templates/eve_api/alliance.html index fb24a2b..65eaf42 100644 --- a/app/eve_api/templates/eve_api/alliance.html +++ b/app/eve_api/templates/eve_api/alliance.html @@ -16,9 +16,9 @@

Corporations

- - {% for corp in alliance.eveplayercorporation_set.all %} - + + {% for corp in corporations %} + {% endfor %}
NameAverage SPAPI CoverageDirector Key?
{{ corp }}{{ corp.average_sp|intcomma }}{{ corp.api_key_coverage|floatformat:2 }}%{{ corp.director_api_keys.count }}
NameMembersAverage SPAPI CoverageDirector Key?
{{ corp }}{{ corp.member_count }}{{ corp.average_sp|intcomma }}{{ corp.api_key_coverage|floatformat:2 }}%{{ corp.director_api_keys.count }}
diff --git a/app/eve_api/views.py b/app/eve_api/views.py index 991ce55..2589fa8 100644 --- a/app/eve_api/views.py +++ b/app/eve_api/views.py @@ -205,6 +205,7 @@ def eveapi_alliance(request, allianceid, template='eve_api/alliance.html'): context = { 'alliance': alliance, 'executor': alliance.executor.ceo_character, + 'corporations': alliance.eveplayercorporation_set.exclude(member_count=0).order_by('name'), } return render_to_response(template, context, context_instance=RequestContext(request))