diff --git a/README.md b/README.md index 3456128a..b0c9b0fc 100755 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ Special Permissions In Admin: auth | user | jabber_broadcast_all ( Can choose from all groups and the 'all' option when broadcasting) auth | user | blue_member ( Auto Added to people who register has a blue when adding api key) auth | user | corp_stats ( View basic corp auth stats *who is authed etc*) + auth | user | corputils ( View who has registered APIs, which alts belong to which main, and more. ) auth | user | timer_management ( Access to create and remove timers) auth | user | timer_view ( Access to timerboard to view timers) auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data) diff --git a/corputils/views.py b/corputils/views.py index ab62cc8a..ba3f9ac7 100644 --- a/corputils/views.py +++ b/corputils/views.py @@ -36,7 +36,7 @@ def corp_member_view(request, corpid = settings.CORP_ID): return HttpResponseRedirect("/corputils/") corp = EveCorporationInfo.objects.get(corporation_id=corpid) - Player = namedtuple("Player", ["main", "maincorp", "altlist"]) + Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist"]) if settings.IS_CORP: member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE) @@ -55,13 +55,15 @@ def corp_member_view(request, corpid = settings.CORP_ID): mainchar = EveCharacter.objects.get(character_id=mainid) mainname = mainchar.character_name maincorp = mainchar.corporation_name - except ValueError: + maincorpid = mainchar.corporation_id + except (ValueError, EveCharacter.DoesNotExist): mainname = "User: " + user.username maincorp = None - characters_with_api.setdefault(mainname, Player(main=mainname, + characters_with_api.setdefault(mainname, Player(main=mainchar, maincorp=maincorp, + maincorpid=maincorpid, altlist=[]) - ).altlist.append(char.character_name) + ).altlist.append(char) except EveCharacter.DoesNotExist: characters_without_api.append(member_data["name"]) diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html index 16c3884a..5482eb44 100644 --- a/stock/templates/registered/corputils.html +++ b/stock/templates/registered/corputils.html @@ -79,8 +79,8 @@
{{ player.maincorp }}
{{ charname }}
+ {% for char in player.altlist %} +{{ char.character_name }}
{% endfor %}