haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1440 from haiwen/org_user_quota

Browse Source 
Use seafile_api to set/get org user quota
This commit is contained in:
xiez
2017-03-13 17:42:21 +08:00
committed by GitHub
parent a42d2ebd13 0f0c360f21
commit d1f3dd154c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
seahub/views/ajax.py
View File

@@ -912,8 +912,7 @@ def space_and_traffic(request):
space_usage = seafile_api.get_user_self_usage(username) space_usage = seafile_api.get_user_self_usage(username)
else: else:
org_id = org[0].org_id org_id = org[0].org_id
space_quota = seafserv_threaded_rpc.get_org_user_quota(org_id, space_quota = seafile_api.get_org_user_quota(org_id, username)
username)
space_usage = seafserv_threaded_rpc.get_org_user_quota_usage( space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(
org_id, username) org_id, username)

6
seahub/views/sysadmin.py
View File

@@ -137,7 +137,7 @@ def _populate_user_quota_usage(user):
user.org = orgs[0] user.org = orgs[0]
org_id = user.org.org_id org_id = user.org.org_id
user.space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, user.email) 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: else:
user.space_usage = seafile_api.get_user_self_usage(user.email) user.space_usage = seafile_api.get_user_self_usage(user.email)
user.space_quota = seafile_api.get_user_quota(user.email) user.space_quota = seafile_api.get_user_quota(user.email)
@@ -513,7 +513,7 @@ def user_info(request, email):
org_name = org[0].org_name org_name = org[0].org_name
space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id, space_usage = seafserv_threaded_rpc.get_org_user_quota_usage(org_id,
email) 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, owned_repos = seafile_api.get_org_owned_repo_list(org_id, email,
ret_corrupted=True) ret_corrupted=True)
in_repos = seafile_api.get_org_share_in_repo_list(org_id, email, -1, -1) in_repos = seafile_api.get_org_share_in_repo_list(org_id, email, -1, -1)
@@ -657,7 +657,7 @@ def user_set_quota(request, email):
org_quota_mb) org_quota_mb)
return HttpResponse(json.dumps(result), status=400, content_type=content_type) return HttpResponse(json.dumps(result), status=400, content_type=content_type)
else: 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: except:
result['error'] = _(u'Failed to set quota: internal server error') result['error'] = _(u'Failed to set quota: internal server error')
return HttpResponse(json.dumps(result), status=500, content_type=content_type) return HttpResponse(json.dumps(result), status=500, content_type=content_type)