Correct state migration for multitenant

This commit is contained in:
Adarnof 2017-01-05 23:48:18 -05:00
parent 395c2c1bec
commit 8e64fe145e

View File

@ -8,12 +8,10 @@ from authentication.states import MEMBER_STATE, BLUE_STATE, NONE_STATE
from django.conf import settings from django.conf import settings
def determine_membership_by_character(char, apps): def determine_membership_by_character(char, apps):
if settings.IS_CORP: if str(char.corporation_id) in settings.STR_CORP_IDS:
if int(char.corporation_id) == int(settings.CORP_ID): return MEMBER_STATE
return MEMBER_STATE elif str(char.alliance_id) in settings.STR_ALLIANCE_IDS:
else: return MEMBER_STATE
if int(char.alliance_id) == int(settings.ALLIANCE_ID):
return MEMBER_STATE
EveCorporationInfo = apps.get_model('eveonline', 'EveCorporationInfo') EveCorporationInfo = apps.get_model('eveonline', 'EveCorporationInfo')
if EveCorporationInfo.objects.filter(corporation_id=char.corporation_id).exists() is False: if EveCorporationInfo.objects.filter(corporation_id=char.corporation_id).exists() is False:
return NONE_STATE return NONE_STATE