diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 4f52a6d179..f4c3990881 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -1355,8 +1355,7 @@ def space_and_traffic(request): space_usage = seafile_api.get_user_self_usage(username) else: org_id = org[0].org_id - space_quota = seafserv_threaded_rpc.get_org_user_quota(org_id, - username) + space_quota = seafile_api.get_org_user_quota(org_id, username) space_usage = seafserv_threaded_rpc.get_org_user_quota_usage( org_id, username) diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index e36cf23131..37a2e97396 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -136,7 +136,7 @@ def _populate_user_quota_usage(user): user.org = orgs[0] org_id = user.org.org_id user.space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email) - user.space_quota = seafserv_threaded_rpc.get_org_user_quota(org_id, user.email) + user.space_quota = seafile_api.get_org_user_quota(org_id, user.email) else: user.space_usage = seafile_api.get_user_self_usage(user.email) user.space_quota = seafile_api.get_user_quota(user.email) @@ -516,7 +516,7 @@ def user_info(request, email): org_name = org[0].org_name space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, email) - space_quota = seafserv_threaded_rpc.get_org_user_quota(org_id, email) + space_quota = seafile_api.get_org_user_quota(org_id, email) owned_repos = seafile_api.get_org_owned_repo_list(org_id, email, ret_corrupted=True) in_repos = seafile_api.get_org_share_in_repo_list(org_id, email, -1, -1) @@ -661,7 +661,7 @@ def user_set_quota(request, email): org_quota_mb) return HttpResponse(json.dumps(result), status=400, content_type=content_type) else: - seafserv_threaded_rpc.set_org_user_quota(org_id, email, space_quota) + seafile_api.set_org_user_quota(org_id, email, space_quota) except: result['error'] = _(u'Failed to set quota: internal server error') return HttpResponse(json.dumps(result), status=500, content_type=content_type)