From 12e6cc63e8bc2090de62a0cafc883682f83b0301 Mon Sep 17 00:00:00 2001 From: colcrunch Date: Sun, 5 Aug 2018 03:34:16 -0400 Subject: [PATCH] Refine auto_leave check. --- allianceauth/groupmanagement/views.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/allianceauth/groupmanagement/views.py b/allianceauth/groupmanagement/views.py index f10b9a55..e0adeff2 100755 --- a/allianceauth/groupmanagement/views.py +++ b/allianceauth/groupmanagement/views.py @@ -340,13 +340,10 @@ def group_request_leave(request, group_id): logger.info("%s attempted to leave %s but already has an pending leave request." % (request.user, group)) messages.warning(request, "You already have a pending leave request for that group.") return redirect("groupmanagement:groups") - if hasattr(settings, 'AUTO_LEAVE'): - if settings.AUTO_LEAVE: - logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group)) - request.user.groups.remove(group) - return redirect('groupmanagement:groups') - else: - pass + if hasattr(settings, 'AUTO_LEAVE', False) and settings.AUTO_LEAVE: + logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group)) + request.user.groups.remove(group) + return redirect('groupmanagement:groups') grouprequest = GroupRequest() grouprequest.status = _('Pending') grouprequest.group = group