haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-28 16:17:02 +00:00
Code Issues Releases Wiki Activity

add institution in admin update user api (#4196)

Browse Source
This commit is contained in:
Leo
2019-10-26 17:19:14 +08:00
committed by Daniel Pan
parent 42d4cd0c13
commit 501cf8f18d
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ from seahub.role_permissions.models import AdminRole
from seahub.role_permissions.utils import get_available_roles from seahub.role_permissions.utils import get_available_roles
from seahub.utils.licenseparse import user_number_over_limit 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.options.models import UserOptions from seahub.options.models import UserOptions
from seahub.share.models import FileShare, UploadLinkShare from seahub.share.models import FileShare, UploadLinkShare
@@ -132,7 +133,7 @@ def create_user_info(request, email, role, nickname, contact_email, quota_total_
def update_user_info(request, user, password, is_active, is_staff, role, def update_user_info(request, user, password, is_active, is_staff, role,
nickname, login_id, contact_email, reference_id, quota_total_mb): nickname, login_id, contact_email, reference_id, quota_total_mb, institution_name):
# update basic user info # update basic user info
if is_active is not None: if is_active is not None:
@@ -173,6 +174,9 @@ def update_user_info(request, user, password, is_active, is_staff, role,
# remove reference id # remove reference id
ccnet_api.set_reference_id(email, None) ccnet_api.set_reference_id(email, None)
if institution_name is not None:
Profile.objects.add_or_update(email, institution=institution_name)
if quota_total_mb: if quota_total_mb:
quota_total = int(quota_total_mb) * get_file_size_unit('MB') quota_total = int(quota_total_mb) * get_file_size_unit('MB')
if is_org_context(request): if is_org_context(request):
@@ -204,6 +208,9 @@ def get_user_info(email):
info['has_default_device'] = True if default_device(user) else False info['has_default_device'] = True if default_device(user) else False
info['is_force_2fa'] = UserOptions.objects.is_force_2fa(email) info['is_force_2fa'] = UserOptions.objects.is_force_2fa(email)
if getattr(settings, 'MULTI_INSTITUTION', False):
info['institution'] = profile.institution if profile else ''
info['role'] = get_user_role(user) info['role'] = get_user_role(user)
return info return info
@@ -606,6 +613,14 @@ class AdminUser(APIView):
error_msg = 'Failed to set quota: maximum quota is %d MB' % org_quota_mb error_msg = 'Failed to set quota: maximum quota is %d MB' % org_quota_mb
return api_error(status.HTTP_400_BAD_REQUEST, error_msg) return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
institution = request.data.get("institution", None)
if institution:
try:
Institution.objects.get(name=institution)
except Institution.DoesNotExist:
error_msg = 'Institution %s does not exist' % institution
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
# query user info # query user info
try: try:
user_obj = User.objects.get(email=email) user_obj = User.objects.get(email=email)
@@ -616,7 +631,7 @@ class AdminUser(APIView):
try: try:
update_user_info(request, user=user_obj, password=password, is_active=is_active, is_staff=is_staff, update_user_info(request, user=user_obj, password=password, is_active=is_active, is_staff=is_staff,
role=role, nickname=name, login_id=login_id, contact_email=contact_email, role=role, nickname=name, login_id=login_id, contact_email=contact_email,
reference_id=reference_id, quota_total_mb=quota_total_mb) reference_id=reference_id, quota_total_mb=quota_total_mb, institution_name=institution)
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
error_msg = 'Internal Server Error' error_msg = 'Internal Server Error'