Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 14:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Visual indication of member registration.

Browse Source
This commit is contained in:
Adarnof 2016-12-13 19:29:02 -05:00
parent 02bd4570b0
commit 5a9418d792
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
corputils/models.py
View File

@ -90,9 +90,9 @@ class CorpStats(models.Model):
char = EveCharacter.objects.get(id=auth.main_char_id) char = EveCharacter.objects.get(id=auth.main_char_id)
if char.corporation_id == self.corp.corporation_id and user.has_perm('corputils.corp_apis'): if char.corporation_id == self.corp.corporation_id and user.has_perm('corputils.corp_apis'):
return True return True
elif char.alliance_id == self.corp.alliance_id and user.has_perm('corputils.alliance_apis'): if self.corp.alliance and char.alliance_id == self.corp.alliance.alliance_id and user.has_perm('corputils.alliance_apis'):
return True return True
elif user.has_perm('corputils.blue_apis') and self.corp.is_blue: if user.has_perm('corputils.blue_apis') and self.corp.is_blue:
return True return True
except EveCharacter.DoesNotExist: except EveCharacter.DoesNotExist:
pass pass
@ -117,13 +117,19 @@ class CorpStats(models.Model):
self.main = EveCharacter.objects.get(character_id=auth.main_char_id) self.main = EveCharacter.objects.get(character_id=auth.main_char_id)
except EveCharacter.DoesNotExist: except EveCharacter.DoesNotExist:
self.main = None self.main = None
api = EveApiKeyPair.objects.get(api_id=char.api_id)
self.registered = True
if show_apis: if show_apis:
self.api = EveApiKeyPair.objects.get(api_id=char.api_id) self.api = api
else:
self.api = None
except (EveCharacter.DoesNotExist, AuthServicesInfo.DoesNotExist): except (EveCharacter.DoesNotExist, AuthServicesInfo.DoesNotExist):
self.main = None self.main = None
self.api = None self.api = None
self.registered = False
except EveApiKeyPair.DoesNotExist: except EveApiKeyPair.DoesNotExist:
self.api = None self.api = None
self.registered = False
def __str__(self): def __str__(self):
return self.character_name return self.character_name

2
corputils/templates/corputils/corpstats.html
View File

@ -66,7 +66,7 @@
<th class="text-center">Main Alliance</th> <th class="text-center">Main Alliance</th>
</tr> </tr>
{% for member in members %} {% for member in members %}
<tr> <tr {% if not member.registered %}class="danger"{% endif %}>
<td><img src="{{ member.portrait_url }}" class="img-circle"></td> <td><img src="{{ member.portrait_url }}" class="img-circle"></td>
<td class="text-center">{{ member.character_name }}</td> <td class="text-center">{{ member.character_name }}</td>
{% if corpstats.show_apis %} {% if corpstats.show_apis %}

2
corputils/templates/corputils/search.html
View File

@ -22,7 +22,7 @@
<th class="text-center">Main Alliance</th> <th class="text-center">Main Alliance</th>
</tr> </tr>
{% for result in results %} {% for result in results %}
<tr> <tr {% if not result.1.registered %}class="danger"{% endif %}>
<td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle"></td> <td class="text-center"><img src="{{ result.1.portrait_url }}" class="img-circle"></td>
<td class="text-center">{{ result.1.character_name }}</td> <td class="text-center">{{ result.1.character_name }}</td>
<td class="text-center">{{ result.0.corp.corporation_name }}</td> <td class="text-center">{{ result.0.corp.corporation_name }}</td>