diff --git a/eveonline/views.py b/eveonline/views.py index 4a7b0410..538891a9 100644 --- a/eveonline/views.py +++ b/eveonline/views.py @@ -105,10 +105,16 @@ def main_character_change(request, char_id): add_user_to_group(request.user, generate_corp_group_name(EveManager.get_character_by_id(char_id).corporation_name)) - elif corporation_info.is_blue: - add_member_permission(request.user, 'blue_member') - add_user_to_group(request.user, settings.DEFAULT_BLUE_GROUP) + elif corporation_info != None: + if corporation_info.is_blue: + add_member_permission(request.user, 'blue_member') + add_user_to_group(request.user, settings.DEFAULT_BLUE_GROUP) + else: + if check_if_user_has_permission(request.user, 'alliance_member'): + disable_alliance_member(request.user, previousmainid) + if check_if_user_has_permission(request.user, 'blue_member'): + disable_blue_member(request.user) else: # TODO: disable serivces if check_if_user_has_permission(request.user, 'alliance_member'): diff --git a/util/__init__.py b/util/__init__.py index 8d5057d9..0b27fd27 100644 --- a/util/__init__.py +++ b/util/__init__.py @@ -41,4 +41,4 @@ def check_if_user_has_permission(user, permission): ct = ContentType.objects.get_for_model(User) stored_permission, created = Permission.objects.get_or_create(codename=permission, content_type=ct, name=permission) - return user.has_perm(stored_permission) \ No newline at end of file + return user.has_perm('auth.' + permission) \ No newline at end of file diff --git a/util/common_task.py b/util/common_task.py index ec6b2fbe..42c43557 100644 --- a/util/common_task.py +++ b/util/common_task.py @@ -33,7 +33,6 @@ def deactivate_services(user): if authinfo.forum_username != "": ForumManager.disable_user(authinfo.forum_username) AuthServicesInfoManager.update_user_forum_info("", "", user) - AuthServicesInfoManager.update_main_char_Id("", user) def generate_corp_group_name(corpname):