Merge branch 'corpstats_mains' into 'master'

HOTFIX: Dont show out of corp mains with alt characters in corp as a main when they are not in corp.

See merge request allianceauth/allianceauth!1154
This commit is contained in:
Ariel Rin 2020-02-18 01:21:54 +00:00
commit 06c7da944c

View File

@ -108,10 +108,11 @@ def corpstats_view(request, corp_id=None):
try: try:
main = char.character_ownership.user.profile.main_character main = char.character_ownership.user.profile.main_character
if main is not None: if main is not None:
if main.character_id not in mains: if main.corporation_id == corpstats.corp.corporation_id:
mains[main.character_id] = {'main':main, 'alts':[]} if main.character_id not in mains:
mains[main.character_id] = {'main':main, 'alts':[]}
mains[main.character_id]['alts'].append(char) mains[main.character_id]['alts'].append(char)
if char.corporation_id == corpstats.corp.corporation_id: if char.corporation_id == corpstats.corp.corporation_id:
members.append(char) members.append(char)