1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-26 07:22:34 +00:00

Fix org repo settings, and org repo related code in api2

This commit is contained in:
zhengxie
2014-05-30 17:55:03 +08:00
parent 7dbd3a68c9
commit 583a1fa1d2
5 changed files with 233 additions and 147 deletions

View File

@@ -1229,7 +1229,7 @@ def upload_file_done(request):
result['error'] = _('Argument missing')
return HttpResponse(json.dumps(result), status=400, content_type=ct)
path = request.GET.get('p', '')
if not path:
if not path:
result['error'] = _('Argument missing')
return HttpResponse(json.dumps(result), status=400, content_type=ct)
@@ -1239,9 +1239,8 @@ def upload_file_done(request):
return HttpResponse(json.dumps(result), status=400, content_type=ct)
owner = seafile_api.get_repo_owner(repo_id)
if not owner:
result['error'] = _('Wrong repo id')
return HttpResponse(json.dumps(result), status=400, content_type=ct)
if not owner: # this is an org repo, get org repo owner
owner = seafile_api.get_org_repo_owner(repo_id)
file_path = path.rstrip('/') + '/' + filename
if seafile_api.get_file_id_by_path(repo_id, file_path) is None: