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

Fix org repo creation bug

Browse Source
This commit is contained in:
zhengxie
2014-05-21 12:07:03 +08:00
parent fc81f373fa
commit 70fd48e30c
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
seahub/views/ajax.py
View File

@@ -1553,16 +1553,28 @@ def repo_create(request):
encrypted_file_key = form.cleaned_data['encrypted_file_key'] encrypted_file_key = form.cleaned_data['encrypted_file_key']
username = request.user.username username = request.user.username
org_id = -1
try: try:
if not encryption: if not encryption:
repo_id = seafile_api.create_repo(repo_name, repo_desc, username, if is_org_context(request):
None) org_id = request.user.org.org_id
repo_id = seafile_api.create_org_repo(repo_name, repo_desc,
username, None, org_id)
else:
repo_id = seafile_api.create_repo(repo_name, repo_desc,
username, None)
else: else:
repo_id = seafile_api.create_enc_repo( if is_org_context(request):
uuid, repo_name, repo_desc, username, org_id = request.user.org.org_id
magic_str, encrypted_file_key, enc_version=2) repo_id = seafile_api.create_org_enc_repo(
except SearpcError, e: uuid, repo_name, repo_desc, username, magic_str,
encrypted_file_key, enc_version=2, org_id=org_id)
else:
repo_id = seafile_api.create_enc_repo(
uuid, repo_name, repo_desc, username,
magic_str, encrypted_file_key, enc_version=2)
except SearpcError as e:
logger.error(e)
repo_id = None repo_id = None
if not repo_id: if not repo_id:
@@ -1584,7 +1596,7 @@ def repo_create(request):
'repo_enc': encryption, 'repo_enc': encryption,
} }
repo_created.send(sender=None, repo_created.send(sender=None,
org_id=-1, org_id=org_id,
creator=username, creator=username,
repo_id=repo_id, repo_id=repo_id,
repo_name=repo_name) repo_name=repo_name)