Refine auto_leave check.

This commit is contained in:
colcrunch 2018-08-05 03:34:16 -04:00
parent 4374064d98
commit 12e6cc63e8

View File

@ -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)) 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.") messages.warning(request, "You already have a pending leave request for that group.")
return redirect("groupmanagement:groups") return redirect("groupmanagement:groups")
if hasattr(settings, 'AUTO_LEAVE'): if hasattr(settings, 'AUTO_LEAVE', False) and settings.AUTO_LEAVE:
if settings.AUTO_LEAVE: logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group))
logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group)) request.user.groups.remove(group)
request.user.groups.remove(group) return redirect('groupmanagement:groups')
return redirect('groupmanagement:groups')
else:
pass
grouprequest = GroupRequest() grouprequest = GroupRequest()
grouprequest.status = _('Pending') grouprequest.status = _('Pending')
grouprequest.group = group grouprequest.group = group