1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00

Merge branch 'user-role'

This commit is contained in:
zhengxie
2014-07-15 17:45:58 +08:00
28 changed files with 336 additions and 87 deletions

View File

@@ -1622,7 +1622,7 @@ def repo_history_changes(request, repo_id):
return HttpResponse(json.dumps(changes), content_type=content_type)
@login_required_ajax
@login_required_ajax
def repo_create(request):
'''
Handle ajax post to create a library.
@@ -1631,9 +1631,14 @@ def repo_create(request):
if request.method != 'POST':
return Http404
result = {}
result = {}
content_type = 'application/json; charset=utf-8'
if not request.user.permissions.can_add_repo():
result['error'] = _(u"You do not have permission to create library")
return HttpResponse(json.dumps(result), status=403,
content_type=content_type)
form = RepoCreateForm(request.POST)
if not form.is_valid():
result['error'] = str(form.errors.values()[0])
@@ -1698,7 +1703,7 @@ def repo_create(request):
repo_name=repo_name)
return HttpResponse(json.dumps(result), content_type=content_type)
@login_required_ajax
@login_required_ajax
def public_repo_create(request):
'''
Handle ajax post to create public repo.
@@ -1707,9 +1712,14 @@ def public_repo_create(request):
if request.method != 'POST':
return Http404
result = {}
result = {}
content_type = 'application/json; charset=utf-8'
if not request.user.permissions.can_add_repo():
result['error'] = _(u"You do not have permission to create library")
return HttpResponse(json.dumps(result), status=403,
content_type=content_type)
form = SharedRepoCreateForm(request.POST)
if not form.is_valid():
result['error'] = str(form.errors.values()[0])