From eb4bf84c01d93957ffa92baa55c8bd20391bf971 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 31 Aug 2011 11:21:07 +0100
Subject: [PATCH] Show if the key is active on the corp list

---
 app/eve_api/models/character.py                | 10 ++++++++--
 app/eve_api/templates/eve_api/corporation.html |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/eve_api/models/character.py b/app/eve_api/models/character.py
index cf5ed41..350c274 100644
--- a/app/eve_api/models/character.py
+++ b/app/eve_api/models/character.py
@@ -70,10 +70,16 @@ class EVEPlayerCharacter(EVEAPIModel):
 
     @property
     def account(self):
-        if self.eveaccount_set.count():
-            return self.eveaccount_set.all()[0]
+        if self.eveaccount_set.filter(api_status=API_STATUS_OK).count():
+            return self.eveaccount_set.filter(api_status=API_STATUS_OK)[0]
         return None
 
+    @property
+    def active_key(self):
+        if self.eveaccount_set.count():
+            return self.eveaccount_set.filter(api_status=API_STATUS_OK).count() > 0
+        return False
+
     @models.permalink
     def get_absolute_url(self):
         return ('eveapi-character', [self.pk])
diff --git a/app/eve_api/templates/eve_api/corporation.html b/app/eve_api/templates/eve_api/corporation.html
index 161dffb..5c161ee 100644
--- a/app/eve_api/templates/eve_api/corporation.html
+++ b/app/eve_api/templates/eve_api/corporation.html
@@ -22,10 +22,10 @@
 
         {% if view_members %}
         <table>
-        <tr><th>Name</th><th>Skillpoints</th><th>Join Date</th><th>Director?</th><th>Roles?</th><th>API Key?</th></tr>
+        <tr><th>Name</th><th>Skillpoints</th><th>Join Date</th><th>Director?</th><th>Roles?</th><th>API Key?</th><th>Key Active?</th></tr>
         {% autopaginate members 20 %}
         {% for char in members %}
-        <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td><td>{% if char.total_sp %}{{ char.total_sp|intcomma }} SP{% endif %}</td><td>{{ char.corporation_date }}</td><td>{% if char.director %}Yes{% endif %}</td><td>{% if char.eveaccount_set.count %}{% if char.roles.count %}Yes{% else %}No{% endif %}{% endif %}<td>{% if char.eveaccount_set.count %}Yes{% else %}<span style="color: red;">No</span>{% endif %}</td></tr>
+        <tr><td><a href="{% url eveapi-character char.id %}">{{ char.name }}</a></td><td>{% if char.total_sp %}{{ char.total_sp|intcomma }} SP{% endif %}</td><td>{{ char.corporation_date }}</td><td>{% if char.director %}Yes{% endif %}</td><td>{% if char.eveaccount_set.count %}{% if char.roles.count %}Yes{% else %}No{% endif %}{% endif %}<td>{% if char.eveaccount_set.count %}Yes{% else %}<span style="color: red;">No</span>{% endif %}</td><td>{% if char.active_key %}Yes{% else %}<span style="color: red;">No</span>{% endif %}</td></tr>
         {% endfor %}
         </table>
         {% paginate %}