Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-10 17:16:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Logging everywhere.

Browse Source 
Corrected corp model updating logic to handle owning corp.
Corrected typecasting during api access mask comparison.
Removed error protection during user TS3 group updating to propogate errors.

Relevent issues:
Sorry for the spam.
This commit is contained in:
Adarnof
2016-01-02 21:24:40 +00:00
parent 9225896938
commit a789edb3d8
16 changed files with 505 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
groupmanagement/views.py
View File

@@ -12,10 +12,14 @@ from models import HiddenGroup
from authentication.managers import AuthServicesInfoManager
from eveonline.managers import EveManager
import logging
logger = logging.getLogger(__name__)
@login_required
@permission_required('auth.group_management')
def group_management(request):
logger.debug("group_management called by user %s" % request.user)
acceptrequests = []
leaverequests = []
@@ -24,6 +28,7 @@ def group_management(request):
leaverequests.append(grouprequest)
else:
acceptrequests.append(grouprequest)
logger.debug("Providing user %s with %s acceptrequests and %s leaverequests." % (request.user, len(acceptrequests), len(leaverequests)))
render_items = {'acceptrequests': acceptrequests, 'leaverequests': leaverequests}
@@ -34,13 +39,16 @@ def group_management(request):
@login_required
@permission_required('auth.group_management')
def group_accept_request(request, group_request_id):
logger.debug("group_accept_request called by user %s for grouprequest id %s" % (request.user, group_request_id))
try:
group_request = GroupRequest.objects.get(id=group_request_id)
group, created = Group.objects.get_or_create(name=group_request.group.name)
group_request.user.groups.add(group)
group_request.user.save()
group_request.delete()
logger.info("User %s accepted group request from user %s to group %s" % (request.user, group_request.user, group_request.group.name))
except:
logger.exception("Unhandled exception occured while user %s attempting to accept grouprequest id %s." % (request.user, group_request_id), exc_info=True)
pass
return HttpResponseRedirect("/group/management/")
@@ -49,12 +57,15 @@ def group_accept_request(request, group_request_id):
@login_required
@permission_required('auth.group_management')
def group_reject_request(request, group_request_id):
logger.debug("group_reject_request called by user %s for group request id %s" % (request.user, group_request_id))
try:
group_request = GroupRequest.objects.get(id=group_request_id)
if group_request:
logger.info("User %s rejected group request from user %s for %s" % (request.user, group_request.user, group_request.group.name))
group_request.delete()
except:
logger.exception("Unhandled exception occured while user %s attempting to reject group request id %s." % (request.user, group_request_id), exc_info=True)
pass
return HttpResponseRedirect("/group/management/")
@@ -63,13 +74,16 @@ def group_reject_request(request, group_request_id):
@login_required
@permission_required('auth.group_management')
def group_leave_accept_request(request, group_request_id):
logger.debug("group_leave_accept_request called by user %s for group request id %s" % (request.user, group_request_id))
try:
group_request = GroupRequest.objects.get(id=group_request_id)
group, created = Group.objects.get_or_create(name=group_request.group.name)
group_request.user.groups.remove(group)
group_request.user.save()
group_request.delete()
logger.info("User %s accepted group leave request from user %s to group %s" % (request.user, group_request.user, group_request.group.name))
except:
logger.exception("Unhandled exception occured while user %s attempting to accept group leave request id %s." % (request.user, group_request_id), exc_info=True)
pass
return HttpResponseRedirect("/group/management/")
@@ -78,12 +92,15 @@ def group_leave_accept_request(request, group_request_id):
@login_required
@permission_required('auth.group_management')
def group_leave_reject_request(request, group_request_id):
logger.debug("group_leave_reject_request called by user %s for group request id %s" % (request.user, group_request_id))
try:
group_request = GroupRequest.objects.get(id=group_request_id)
if group_request:
group_request.delete()
logger.info("User %s rejected group leave request from user %s for %s" % (request.user, group_request.user, group_request.group.name))
except:
logger.exception("Unhandled exception occured while user %s attempting to reject group leave request id %s." % (request.user, group_request_id), exc_info=True)
pass
return HttpResponseRedirect("/group/management/")
@@ -91,6 +108,7 @@ def group_leave_reject_request(request, group_request_id):
@login_required
def groups_view(request):
logger.debug("groups_view called by user %s" % request.user)
paired_list = []
for group in Group.objects.all():
@@ -126,6 +144,7 @@ def groups_view(request):
@login_required
def group_request_add(request, group_id):
logger.debug("group_request_add called by user %s for group_id" % (request.user, group_id))
auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
grouprequest = GroupRequest()
grouprequest.status = 'pending'
@@ -134,12 +153,14 @@ def group_request_add(request, group_id):
grouprequest.main_char = EveManager.get_character_by_id(auth_info.main_char_id)
grouprequest.leave_request = False
grouprequest.save()
logger.info("Created group request for user %s to group %s" % (request.user, Group.objects.get(id=group_id)))
return HttpResponseRedirect("/groups")
@login_required
def group_request_leave(request, group_id):
logger.debug("group_request_leave called by user %s for group id %s" % (request.user, group_id))
auth_info = AuthServicesInfoManager.get_auth_service_info(request.user)
grouprequest = GroupRequest()
grouprequest.status = 'pending'
@@ -148,5 +169,6 @@ def group_request_leave(request, group_id):
grouprequest.main_char = EveManager.get_character_by_id(auth_info.main_char_id)
grouprequest.leave_request = True
grouprequest.save()
logger.info("Created group leave request for user %s to group %s" % (request.user, Group.objects.get(id=group_id)))
return HttpResponseRedirect("/groups")