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 %}
| Name | Skillpoints | Join Date | Director? | Roles? | API Key? | |
|---|---|---|---|---|---|---|
| Name | Skillpoints | Join Date | Director? | Roles? | API Key? | Key Active? |
| {{ char.name }} | {% if char.total_sp %}{{ char.total_sp|intcomma }} SP{% endif %} | {{ char.corporation_date }} | {% if char.director %}Yes{% endif %} | {% if char.eveaccount_set.count %}{% if char.roles.count %}Yes{% else %}No{% endif %}{% endif %} | {% if char.eveaccount_set.count %}Yes{% else %}No{% endif %} | |
| {{ char.name }} | {% if char.total_sp %}{{ char.total_sp|intcomma }} SP{% endif %} | {{ char.corporation_date }} | {% if char.director %}Yes{% endif %} | {% if char.eveaccount_set.count %}{% if char.roles.count %}Yes{% else %}No{% endif %}{% endif %} | {% if char.eveaccount_set.count %}Yes{% else %}No{% endif %} | {% if char.active_key %}Yes{% else %}No{% endif %} |