haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 04:18:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #524 from haiwen/folder-perm

Browse Source 
[folder-perm] log error
This commit is contained in:
Daniel Pan
2015-04-25 15:28:05 +08:00
parent e68d81279c c5113cb647
commit dc4131bf2d
1 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
seahub/views/ajax.py
View File

@@ -2295,11 +2295,12 @@ def set_user_folder_perm(request, repo_id):
if not user_folder_perm: if not user_folder_perm:
try: try:
seafile_api.add_folder_user_perm(repo_id, path, perm, user) seafile_api.add_folder_user_perm(repo_id, path, perm, user)
send_perm_audit_msg('add-repo-perm', request.user.username, user, \ send_perm_audit_msg('add-repo-perm', request.user.username,
repo_id, path, perm) user, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Already add this folder permission')}), return HttpResponse(json.dumps({"error": _('Already add this folder permission')}),
status=400, content_type=content_type) status=400, content_type=content_type)
@@ -2308,11 +2309,12 @@ def set_user_folder_perm(request, repo_id):
if user_folder_perm and user_folder_perm != perm: if user_folder_perm and user_folder_perm != perm:
try: try:
seafile_api.set_folder_user_perm(repo_id, path, perm, user) seafile_api.set_folder_user_perm(repo_id, path, perm, user)
send_perm_audit_msg('modify-repo-perm', request.user.username, user, \ send_perm_audit_msg('modify-repo-perm', request.user.username,
repo_id, path, perm) user, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Wrong folder permission')}), return HttpResponse(json.dumps({"error": _('Wrong folder permission')}),
status=400, content_type=content_type) status=400, content_type=content_type)
@@ -2321,14 +2323,16 @@ def set_user_folder_perm(request, repo_id):
if user_folder_perm: if user_folder_perm:
try: try:
seafile_api.rm_folder_user_perm(repo_id, path, user) seafile_api.rm_folder_user_perm(repo_id, path, user)
send_perm_audit_msg('delete-repo-perm', request.user.username, user, \ send_perm_audit_msg('delete-repo-perm', request.user.username,
repo_id, path, perm) user, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Please add folder permission first')}), return HttpResponse(json.dumps({"error": _('Please add folder permission first')}),
status=400, content_type=content_type) status=400, content_type=content_type)
return HttpResponse(json.dumps({'success': True}), return HttpResponse(json.dumps({'success': True}),
content_type=content_type) content_type=content_type)
@@ -2364,11 +2368,12 @@ def set_group_folder_perm(request, repo_id):
if not group_folder_perm: if not group_folder_perm:
try: try:
seafile_api.add_folder_group_perm(repo_id, path, perm, group_id) seafile_api.add_folder_group_perm(repo_id, path, perm, group_id)
send_perm_audit_msg('add-repo-perm', request.user.username, \ send_perm_audit_msg('add-repo-perm', request.user.username,
group_id, repo_id, path, perm) group_id, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Already add this folder permission')}), return HttpResponse(json.dumps({"error": _('Already add this folder permission')}),
status=400, content_type=content_type) status=400, content_type=content_type)
@@ -2377,11 +2382,12 @@ def set_group_folder_perm(request, repo_id):
if group_folder_perm and group_folder_perm != perm: if group_folder_perm and group_folder_perm != perm:
try: try:
seafile_api.set_folder_group_perm(repo_id, path, perm, group_id) seafile_api.set_folder_group_perm(repo_id, path, perm, group_id)
send_perm_audit_msg('modify-repo-perm', request.user.username, \ send_perm_audit_msg('modify-repo-perm', request.user.username,
group_id, repo_id, path, perm) group_id, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Wrong folder permission')}), return HttpResponse(json.dumps({"error": _('Wrong folder permission')}),
status=400, content_type=content_type) status=400, content_type=content_type)
@@ -2390,11 +2396,12 @@ def set_group_folder_perm(request, repo_id):
if group_folder_perm: if group_folder_perm:
try: try:
seafile_api.rm_folder_group_perm(repo_id, path, group_id) seafile_api.rm_folder_group_perm(repo_id, path, group_id)
send_perm_audit_msg('delete-repo-perm', request.user.username, \ send_perm_audit_msg('delete-repo-perm', request.user.username,
group_id, repo_id, path, perm) group_id, repo_id, path, perm)
except SearpcError, e: except SearpcError as e:
return HttpResponse(json.dumps({"error": e.msg}), status=500, logger.error(e)
content_type=content_type) return HttpResponse(json.dumps({"error": _('Operation failed')}),
status=500, content_type=content_type)
else: else:
return HttpResponse(json.dumps({"error": _('Please add folder permission first')}), return HttpResponse(json.dumps({"error": _('Please add folder permission first')}),
status=400, content_type=content_type) status=400, content_type=content_type)