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

Added extra check

Browse Source
This commit is contained in:
Raynaldo Rivera 2014-10-12 17:19:12 -07:00
parent 392c752eb8
commit b869c465bb
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eveonline/views.py
View File

@ -1,5 +1,7 @@
from util import add_member_permission from util import add_member_permission
from util import remove_member_permission from util import remove_member_permission
from util import check_if_user_has_permission
from django.conf import settings from django.conf import settings
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
@ -84,11 +86,12 @@ def main_character_change(request, char_id):
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))
else: else:
#TODO: disable serivces #TODO: disable serivces
remove_member_permission(request.user, 'alliance_member') if check_if_user_has_permission(request.user, 'alliance_member'):
remove_user_from_group(request.user, settings.DEFAULT_ALLIANCE_GROUP) remove_member_permission(request.user, 'alliance_member')
remove_user_from_group(request.user, remove_user_from_group(request.user, settings.DEFAULT_ALLIANCE_GROUP)
generate_corp_group_name(EveManager.get_character_by_id(previousmainid).corporation_name)) remove_user_from_group(request.user,
deactivate_services(request.user) generate_corp_group_name(EveManager.get_character_by_id(previousmainid).corporation_name))
deactivate_services(request.user)
return HttpResponseRedirect("/characters") return HttpResponseRedirect("/characters")
return HttpResponseRedirect("/characters") return HttpResponseRedirect("/characters")

2
templates/public/index.html
View File

@ -17,7 +17,7 @@ div {
margin-top: -100px; margin-top: -100px;
margin-left: -200px; margin-left: -200px;
} }
</style> </style>
<html> <html>

9
util/__init__.py
View File

@ -22,4 +22,11 @@ def remove_member_permission(user, permission):
user = User.objects.get(username=user.username) user = User.objects.get(username=user.username)
if user.has_perm(permission): if user.has_perm(permission):
user.user_permissions.remove(stored_permission) user.user_permissions.remove(stored_permission)
user.save() user.save()
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)