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

Fixed issue when picking a primary character who is not blue/not in alliance

Browse Source
This commit is contained in:
Raynaldo Rivera 2014-11-05 13:54:43 -07:00
parent fe751ffc77
commit d4f16f49f1
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eveonline/views.py
View File

@ -105,10 +105,16 @@ def main_character_change(request, char_id):
add_user_to_group(request.user, add_user_to_group(request.user,
generate_corp_group_name(EveManager.get_character_by_id(char_id).corporation_name)) generate_corp_group_name(EveManager.get_character_by_id(char_id).corporation_name))
elif corporation_info.is_blue: elif corporation_info != None:
add_member_permission(request.user, 'blue_member') if corporation_info.is_blue:
add_user_to_group(request.user, settings.DEFAULT_BLUE_GROUP) 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: else:
# TODO: disable serivces # TODO: disable serivces
if check_if_user_has_permission(request.user, 'alliance_member'): if check_if_user_has_permission(request.user, 'alliance_member'):

2
util/__init__.py
View File

@ -41,4 +41,4 @@ def check_if_user_has_permission(user, permission):
ct = ContentType.objects.get_for_model(User) ct = ContentType.objects.get_for_model(User)
stored_permission, created = Permission.objects.get_or_create(codename=permission, stored_permission, created = Permission.objects.get_or_create(codename=permission,
content_type=ct, name=permission) content_type=ct, name=permission)
return user.has_perm(stored_permission) return user.has_perm('auth.' + permission)

1
util/common_task.py
View File

@ -33,7 +33,6 @@ def deactivate_services(user):
if authinfo.forum_username != "": if authinfo.forum_username != "":
ForumManager.disable_user(authinfo.forum_username) ForumManager.disable_user(authinfo.forum_username)
AuthServicesInfoManager.update_user_forum_info("", "", user) AuthServicesInfoManager.update_user_forum_info("", "", user)
AuthServicesInfoManager.update_main_char_Id("", user)
def generate_corp_group_name(corpname): def generate_corp_group_name(corpname):