From 4d0417f1142479204cde3e1af3a1440bff6f4172 Mon Sep 17 00:00:00 2001 From: colcrunch Date: Fri, 30 Nov 2018 07:54:51 +0000 Subject: [PATCH] None is not a valid alliance ID. --- allianceauth/corputils/managers.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/allianceauth/corputils/managers.py b/allianceauth/corputils/managers.py index 7f1bd47d..640cf170 100644 --- a/allianceauth/corputils/managers.py +++ b/allianceauth/corputils/managers.py @@ -16,10 +16,16 @@ class CorpStatsQuerySet(models.QuerySet): assert char # build all accepted queries queries = [models.Q(token__user=user)] - if user.has_perm('corputils.view_corp_corpstats'): - queries.append(models.Q(corp__corporation_id=char.corporation_id)) if user.has_perm('corputils.view_alliance_corpstats'): - queries.append(models.Q(corp__alliance__alliance_id=char.alliance_id)) + if char.alliance_id is not None: + queries.append(models.Q(corp__alliance__alliance_id=char.alliance_id)) + else: + queries.append(models.Q(corp__corporation_id=char.corporation_id)) + if user.has_perm('corputils.view_corp_corpstats'): + if user.has_perm('corputils.view_alliance_corpstats'): + pass + else: + queries.append(models.Q(corp__corporation_id=char.corporation_id)) if user.has_perm('corputils.view_state_corpstats'): queries.append(models.Q(corp__in=user.profile.state.member_corporations.all())) queries.append(models.Q(corp__alliance__in=user.profile.state.member_alliances.all()))