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

Fix copy paste error, add extra debug output

Browse Source
This commit is contained in:
Basraah 2017-12-22 11:35:49 +10:00
parent 1653a57e7b
commit 856f1e176a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
allianceauth/eveonline/autogroups/models.py
View File

@ -110,11 +110,12 @@ class AutogroupsConfig(models.Model):
group = None group = None
try: try:
if not self.alliance_groups or not self.user_entitled_to_groups(user): if not self.alliance_groups or not self.user_entitled_to_groups(user):
logger.debug('User {} does not have required state'.format(user)) logger.debug('User {} does not have required state for alliance group membership'.format(user))
return return
else: else:
alliance = user.profile.main_character.alliance alliance = user.profile.main_character.alliance
if alliance is None: if alliance is None:
logger.debug('User {} alliance is None, cannot update group membership'.format(user))
return return
group = self.get_alliance_group(alliance) group = self.get_alliance_group(alliance)
except EveAllianceInfo.DoesNotExist: except EveAllianceInfo.DoesNotExist:
@ -123,8 +124,9 @@ class AutogroupsConfig(models.Model):
except AttributeError: except AttributeError:
logger.warning('User {} does not have a main character. Group membership not updated'.format(user)) logger.warning('User {} does not have a main character. Group membership not updated'.format(user))
finally: finally:
self.remove_user_from_corp_groups(user, except_group=group) self.remove_user_from_alliance_groups(user, except_group=group)
if group is not None: if group is not None:
logger.debug('Adding user {} to alliance group {}'.format(user, group))
user.groups.add(group) user.groups.add(group)
@transaction.atomic @transaction.atomic
@ -132,7 +134,7 @@ class AutogroupsConfig(models.Model):
group = None group = None
try: try:
if not self.corp_groups or not self.user_entitled_to_groups(user): if not self.corp_groups or not self.user_entitled_to_groups(user):
logger.debug('User {} does not have required state'.format(user)) logger.debug('User {} does not have required state for corp group membership'.format(user))
else: else:
corp = user.profile.main_character.corporation corp = user.profile.main_character.corporation
group = self.get_corp_group(corp) group = self.get_corp_group(corp)
@ -144,6 +146,7 @@ class AutogroupsConfig(models.Model):
finally: finally:
self.remove_user_from_corp_groups(user, except_group=group) self.remove_user_from_corp_groups(user, except_group=group)
if group is not None: if group is not None:
logger.debug('Adding user {} to corp group {}'.format(user, group))
user.groups.add(group) user.groups.add(group)
@transaction.atomic @transaction.atomic