diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 718421a2b6..ec688a35a1 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -915,8 +915,7 @@ def space_and_traffic(request): else: org_id = org[0].org_id space_quota = seafile_api.get_org_user_quota(org_id, username) - space_usage = seafserv_threaded_rpc.get_org_user_quota_usage( - org_id, username) + space_usage = seafile_api.get_org_user_quota_usage(org_id, username) rates = {} if space_quota > 0: diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py index 225145ce04..d5bf856109 100644 --- a/seahub/views/sysadmin.py +++ b/seahub/views/sysadmin.py @@ -139,7 +139,7 @@ def _populate_user_quota_usage(user): if orgs: 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_usage = seafile_api.get_org_user_quota_usage(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) @@ -514,7 +514,7 @@ def user_info(request, email): else: org_id = org[0].org_id org_name = org[0].org_name - space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, + space_usage = seafile_api.get_org_user_quota_usage(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, @@ -1310,10 +1310,8 @@ def sys_org_info_user(request, org_id): if user.email == request.user.email: user.is_self = True try: - user.self_usage =seafserv_threaded_rpc. \ - get_org_user_quota_usage(org_id, user.email) - user.quota = seafserv_threaded_rpc. \ - get_org_user_quota(org_id, user.email) + user.self_usage = seafile_api.get_org_user_quota_usage(org_id, user.email) + user.quota = seafile_api.get_org_user_quota(org_id, user.email) except SearpcError as e: logger.error(e) user.self_usage = -1