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

[ajax] Remove repo checking when deleting a repo

Browse Source
This commit is contained in:
zhengxie
2014-12-08 15:50:38 +08:00
parent f338324f9b
commit c5cea76371
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
seahub/views/ajax.py
View File

@@ -1311,13 +1311,9 @@ def repo_remove(request, repo_id):
return HttpResponse(json.dumps(result), status=403, content_type=ct) return HttpResponse(json.dumps(result), status=403, content_type=ct)
repo = get_repo(repo_id) repo = get_repo(repo_id)
if not repo:
result['error'] = _(u'Library does not exist')
return HttpResponse(json.dumps(result), status=400, content_type=ct)
username = request.user.username username = request.user.username
if is_org_context(request): if is_org_context(request):
# Remove repo in org context, only repo owner or org staff can # Remove repo in org context, only (sys admin/repo owner/org staff) can
# perform this operation. # perform this operation.
org_id = request.user.org.org_id org_id = request.user.org.org_id
is_org_staff = request.user.org.is_staff is_org_staff = request.user.org.is_staff
@@ -1326,31 +1322,31 @@ def repo_remove(request, repo_id):
# Must get related useres before remove the repo # Must get related useres before remove the repo
usernames = get_related_users_by_org_repo(org_id, repo_id) usernames = get_related_users_by_org_repo(org_id, repo_id)
seafile_api.remove_repo(repo_id) seafile_api.remove_repo(repo_id)
if repo: # send delete signal only repo is valid
repo_deleted.send(sender=None, repo_deleted.send(sender=None,
org_id=org_id, org_id=org_id,
usernames=usernames, usernames=usernames,
repo_owner=username, repo_owner=username,
repo_id=repo_id, repo_id=repo_id,
repo_name=repo.name, repo_name=repo.name)
)
result['success'] = True result['success'] = True
return HttpResponse(json.dumps(result), content_type=ct) return HttpResponse(json.dumps(result), content_type=ct)
else: else:
result['error'] = _(u'Permission denied.') result['error'] = _(u'Permission denied.')
return HttpResponse(json.dumps(result), status=403, content_type=ct) return HttpResponse(json.dumps(result), status=403, content_type=ct)
else: else:
# Remove repo in personal context, only repo owner or site staff can # Remove repo in personal context, only (repo owner/sys admin) can
# perform this operation. # perform this operation.
if validate_owner(request, repo_id) or request.user.is_staff: if validate_owner(request, repo_id) or request.user.is_staff:
usernames = get_related_users_by_repo(repo_id) usernames = get_related_users_by_repo(repo_id)
seafile_api.remove_repo(repo_id) seafile_api.remove_repo(repo_id)
if repo: # send delete signal only repo is valid
repo_deleted.send(sender=None, repo_deleted.send(sender=None,
org_id=-1, org_id=-1,
usernames=usernames, usernames=usernames,
repo_owner=username, repo_owner=username,
repo_id=repo_id, repo_id=repo_id,
repo_name=repo.name, repo_name=repo.name)
)
result['success'] = True result['success'] = True
return HttpResponse(json.dumps(result), content_type=ct) return HttpResponse(json.dumps(result), content_type=ct)
else: else: