haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 14:50:29 +00:00
Code Issues Releases Wiki Activity

add admin logs in user operation (#4201)

Browse Source
This commit is contained in:
Leo
2019-10-28 15:13:48 +08:00
committed by Daniel Pan
parent 56ae35d1ee
commit 0f95a6bae3
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
seahub/api2/endpoints/admin/users.py
View File

@@ -42,6 +42,8 @@ from seahub.utils.licenseparse import user_number_over_limit
from seahub.constants import DEFAULT_USER from seahub.constants import DEFAULT_USER
from seahub.institutions.models import Institution from seahub.institutions.models import Institution
from seahub.avatar.templatetags.avatar_tags import api_avatar_url from seahub.avatar.templatetags.avatar_tags import api_avatar_url
from seahub.admin_log.signals import admin_operation
from seahub.admin_log.models import USER_DELETE, USER_ADD
from seahub.options.models import UserOptions from seahub.options.models import UserOptions
from seahub.share.models import FileShare, UploadLinkShare from seahub.share.models import FileShare, UploadLinkShare
@@ -387,14 +389,14 @@ class AdminUsers(APIView):
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# basic user info check # basic user info check
is_staff = request.data.get("is_staff", False) is_staff = request.data.get("is_staff", 'False')
try: try:
is_staff = to_python_boolean(is_staff) is_staff = to_python_boolean(is_staff)
except ValueError: except ValueError:
error_msg = 'is_staff invalid.' error_msg = 'is_staff invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
is_active = request.data.get("is_active", True) is_active = request.data.get("is_active", 'True')
try: try:
is_active = to_python_boolean(is_active) is_active = to_python_boolean(is_active)
except ValueError: except ValueError:
@@ -485,6 +487,13 @@ class AdminUsers(APIView):
user_info = get_user_info(email) user_info = get_user_info(email)
user_info['add_user_tip'] = add_user_tip user_info['add_user_tip'] = add_user_tip
# send admin operation log signal
admin_op_detail = {
"email": email,
}
admin_operation.send(sender=None, admin_name=request.user.username,
operation=USER_ADD, detail=admin_op_detail)
return Response(user_info) return Response(user_info)
@@ -707,6 +716,13 @@ class AdminUser(APIView):
error_msg = 'Internal Server Error' error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg) return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
# send admin operation log signal
admin_op_detail = {
"email": email,
}
admin_operation.send(sender=None, admin_name=request.user.username,
operation=USER_DELETE, detail=admin_op_detail)
return Response({'success': True}) return Response({'success': True})