diff --git a/seahub/urls.py b/seahub/urls.py index 5eaf5429f9..dd94259072 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -180,7 +180,7 @@ urlpatterns = patterns('', ## ajax lib url(r'^ajax/lib/(?P[-0-9a-f]{36})/dir/$', list_lib_dir, name="list_lib_dir"), - url(r'^ajax/repo/unsetinnerpub/(?P[-0-9a-f]{36})/$', ajax_unsetinnerpub, name='unsetinnerpub'), + url(r'^ajax/unset-inner-pub-repo/(?P[-0-9a-f]{36})/$', ajax_unset_inner_pub_repo, name='ajax_unset_inner_pub_repo'), ### Organizaion ### url(r'^pubinfo/libraries/$', pubrepo, name='pubrepo'), diff --git a/seahub/views/ajax.py b/seahub/views/ajax.py index 39761c8158..7c1d123c66 100644 --- a/seahub/views/ajax.py +++ b/seahub/views/ajax.py @@ -2507,7 +2507,7 @@ def toggle_personal_modules(request): content_type=content_type) @login_required_ajax -def ajax_unsetinnerpub(request, repo_id): +def ajax_unset_inner_pub_repo(request, repo_id): """ Unshare repos in organization. @@ -2564,7 +2564,7 @@ def ajax_unsetinnerpub(request, repo_id): send_perm_audit_msg('delete-repo-perm', username, 'all', \ perm_repo_id, perm_path, perm) - return HttpResponse(json.dumps({ "success": True }), content_type=content_type) + return HttpResponse(json.dumps({"success": True}), content_type=content_type) except SearpcError: - return HttpResponse(json.dumps({ "success": False }), + return HttpResponse(json.dumps({"error": _('Internal server error')}), status=500, content_type=content_type) diff --git a/static/scripts/app/views/organization-repo.js b/static/scripts/app/views/organization-repo.js index e0873c97be..7f75786b21 100644 --- a/static/scripts/app/views/organization-repo.js +++ b/static/scripts/app/views/organization-repo.js @@ -37,7 +37,7 @@ define([ var el = this.$el; Common.ajaxGet({ get_url: Common.getUrl({ - name:'ajax_unsetinnerpub', + name: 'ajax_unset_inner_pub_repo', repo_id: this.model.get('id') }), data: { @@ -47,9 +47,7 @@ define([ el.remove(); Common.feedback(gettext('Success'), 'success', Common.SUCCESS_TIMOUT); }, - after_op_error: function() { - // TODO - } + after_op_error: Common.ajaxErrorHandler }); } diff --git a/static/scripts/common.js b/static/scripts/common.js index 131f93e611..40a90e2df0 100644 --- a/static/scripts/common.js +++ b/static/scripts/common.js @@ -115,7 +115,8 @@ define([ case 'toggle_personal_modules': return siteRoot + 'ajax/toggle-personal-modules/'; - case 'ajax_unsetinnerpub': return siteRoot + 'ajax/repo/unsetinnerpub/' + options.repo_id + '/'; + case 'ajax_unset_inner_pub_repo': return siteRoot + 'ajax/unset-inner-pub-repo/' + options.repo_id + '/'; + } },