Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
-rw-r--r--app/controllers/admin/users_controller.rb14
1 files changed, 10 insertions, 4 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 00b17bf381f..7fc534be253 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -114,10 +114,16 @@ class Admin::UsersController < Admin::ApplicationController
def block
result = Users::BlockService.new(current_user).execute(user)
- if result[:status] == :success
- redirect_back_or_admin_user(notice: _("Successfully blocked"))
- else
- redirect_back_or_admin_user(alert: _("Error occurred. User was not blocked"))
+ respond_to do |format|
+ if result[:status] == :success
+ notice = _("Successfully blocked")
+ format.json { render json: { notice: notice } }
+ format.html { redirect_back_or_admin_user(notice: notice) }
+ else
+ alert = _("Error occurred. User was not blocked")
+ format.json { render json: { error: alert } }
+ format.html { redirect_back_or_admin_user(alert: alert) }
+ end
end
end