haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 19:37:28 +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

8
seahub/views/sysadmin.py
View File

@@ -132,7 +132,7 @@ def _populate_user_quota_usage(user):
Arguments:
- `user`:
"""
orgs = ccnet_threaded_rpc.get_orgs_by_user(user.email)
orgs = ccnet_api.get_orgs_by_user(user.email)
try:
if orgs:
user.org = orgs[0]
@@ -502,7 +502,7 @@ def user_info(request, email):
org_name = None
space_quota = space_usage = 0
org = ccnet_threaded_rpc.get_orgs_by_user(email)
org = ccnet_api.get_orgs_by_user(email)
if not org:
owned_repos = mute_seafile_api.get_owned_repo_list(email,
ret_corrupted=True)
@@ -646,7 +646,7 @@ def user_set_quota(request, email):
space_quota_mb = f.cleaned_data['space_quota']
space_quota = space_quota_mb * get_file_size_unit('MB')
org = ccnet_threaded_rpc.get_orgs_by_user(email)
org = ccnet_api.get_orgs_by_user(email)
try:
if not org:
seafile_api.set_user_quota(email, space_quota)
@@ -702,7 +702,7 @@ def user_remove(request, email):
try:
user = User.objects.get(email=email)
org = ccnet_threaded_rpc.get_orgs_by_user(user.email)
org = ccnet_api.get_orgs_by_user(user.email)
if org:
if org[0].creator == user.email:
messages.error(request, _(u'Failed to delete: the user is an organization creator'))