From e445d2d82fb0252a657a7c9e852650e2aab1f1d6 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 25 May 2011 10:33:50 +0100 Subject: [PATCH] Fix account lookup, also show accounts on the charlist --- app/eve_api/models/character.py | 2 +- app/eve_api/templates/eve_api/character_list.html | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/eve_api/models/character.py b/app/eve_api/models/character.py index f25d788..ed38dd3 100644 --- a/app/eve_api/models/character.py +++ b/app/eve_api/models/character.py @@ -69,7 +69,7 @@ class EVEPlayerCharacter(EVEAPIModel): return None @property - def account(self) + def account(self): if self.eveaccount_set.count(): return self.eveaccount_set.all()[0] return None diff --git a/app/eve_api/templates/eve_api/character_list.html b/app/eve_api/templates/eve_api/character_list.html index 8149c5a..857d63d 100644 --- a/app/eve_api/templates/eve_api/character_list.html +++ b/app/eve_api/templates/eve_api/character_list.html @@ -5,15 +5,21 @@

Character List

{% if characters %} + +{% regroup characters by account as acc_list %} + -{% for char in characters %} +{% for acc in acc_list %} + +{% for char in acc.list %} {% endfor %} +{% endfor %}
Character NameCorporationAllianceTraining
Account {{ acc.grouper }}
{{ char.name }} {{ char.corporation }} {% if char.corporation.alliance %}{{ char.corporation.alliance }}{% endif %} {% if char.current_training %}{{ char.current_training.skill.name }} to Level {{ char.current_training.in_training }}{% endif %}
{% endif %}