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

add user parameter to update_user_info func.

Browse Source
This commit is contained in:
lian
2017-09-07 14:44:10 +08:00
parent 91dc4238c6
commit a006e202c6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,7 @@ from seahub.role_permissions.utils import get_available_roles
logger = logging.getLogger(__name__)
json_content_type = 'application/json; charset=utf-8'
def update_user_info(request):
email = request.data.get("email")
user = User.objects.get(email=email)
def update_user_info(request, user):
# update basic user info
password = request.data.get("password")
@@ -52,6 +49,8 @@ def update_user_info(request):
# update user
user.save()
email = user.username
# update additional user info
if is_pro_version():
role = request.data.get("role")
@@ -234,8 +233,8 @@ class AdminUsers(APIView):
# create user
try:
User.objects.create_user(email)
update_user_info(request)
user_obj = User.objects.create_user(email)
update_user_info(request, user_obj)
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
@@ -329,13 +328,13 @@ class AdminUser(APIView):
# query user info
try:
User.objects.get(email=email)
user_obj = User.objects.get(email=email)
except User.DoesNotExist:
error_msg = 'User %s not found.' % email
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
try:
update_user_info(request)
update_user_info(request, user_obj)
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'