Revert "Add Audit Logs to Open Groups and Autoleaves"

This reverts commit f64d81292e8b6c0531d610799098c3e3cf105c87.
This commit is contained in:
Ariel Rin 2021-01-06 02:38:47 +00:00
parent f4c4ae36ed
commit 3d7a84e786
3 changed files with 18 additions and 5 deletions

View File

@ -356,6 +356,9 @@ def group_request_add(request, group_id):
if group.authgroup.open:
logger.info("%s joining %s as is an open group" % (request.user, group))
request.user.groups.add(group)
request_info = request.user.username + ":" + group.name
log = RequestLog(request_type=False, group=group, request_info=request_info, action=1, request_actor=request.user)
log.save()
return redirect("groupmanagement:groups")
req = GroupRequest.objects.filter(user=request.user, group=group)
if len(req) > 0:
@ -389,6 +392,9 @@ def group_request_leave(request, group_id):
return redirect('groupmanagement:groups')
if group.authgroup.open:
logger.info("%s leaving %s as is an open group" % (request.user, group))
request_info = request.user.username + ":" + group.name
log = RequestLog(request_type=True, group=group, request_info=request_info, action=1, request_actor=request.user)
log.save()
request.user.groups.remove(group)
return redirect("groupmanagement:groups")
req = GroupRequest.objects.filter(user=request.user, group=group)
@ -398,6 +404,9 @@ def group_request_leave(request, group_id):
return redirect("groupmanagement:groups")
if getattr(settings, 'AUTO_LEAVE', False):
logger.info("%s leaving joinable group %s due to auto_leave" % (request.user, group))
request_info = request.user.username + ":" + group.name
log = RequestLog(request_type=True, group=group, request_info=request_info, action=1, request_actor=request.user)
log.save()
request.user.groups.remove(group)
return redirect('groupmanagement:groups')
grouprequest = GroupRequest()

View File

@ -26,11 +26,6 @@ These logs contain the Date and Time the action was taken (in EVE/UTC), the user
![Audit Log Example](/_static/images/features/core/groupmanagement/group_audit_log.png)
```eval_rst
.. note::
There is no tracking for "Open" groups as members are able to freely join/leave these groups.
```
## Group Leaders
Group leaders have the same abilities as users with the `group_management` permission, _however_, they will only be able to:

View File

@ -48,3 +48,12 @@ When a user loses this permission, they will be removed from all groups _except_
.. note::
By default, the ``groupmanagement.request_groups`` permission is applied to the ``Member`` group. In most instances this, and perhaps adding it to the ``Blue`` group, should be all that is ever needed. It is unsupported and NOT advisable to apply this permission to a public group. See #697 for more information.
```
### Auto Leave
By default in AA, Both requests and leaves for non-open groups must be approved by a group manager. If you wish to allow users to leave groups without requiring approvals, add the following lines to your `local.py`
```python
## Allows users to freely leave groups without requiring approval.
AUTO_LEAVE = True
```