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

Merge branch '6.0'

Browse Source 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
This commit is contained in:
zhengxie
2017-04-17 16:21:22 +08:00
parent 088bf8f6c5 3d662c3fdb
commit e6e6e82b82
56 changed files with 821 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/views/ajax.py
View File

@@ -906,7 +906,7 @@ def space_and_traffic(request):
username = request.user.username
# space & quota calculation
org = ccnet_threaded_rpc.get_orgs_by_user(username)
org = ccnet_api.get_orgs_by_user(username)
if not org:
space_quota = seafile_api.get_user_quota(username)
space_usage = seafile_api.get_user_self_usage(username)