From 0fca3205b5c735c55e3f2cdf0ea3f9aa95dce358 Mon Sep 17 00:00:00 2001 From: Saurabh Patel Date: Mon, 31 Dec 2018 15:16:39 +0530 Subject: [PATCH] FIX: show error msg on grant badge if message available from backend (#6801) --- .../javascripts/admin/controllers/admin-user-badges.js.es6 | 6 +++--- app/controllers/user_badges_controller.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 index c71c83c8c5b..06cec9f53d8 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-badges.js.es6 @@ -1,4 +1,5 @@ import GrantBadgeController from "discourse/mixins/grant-badge-controller"; +import { popupAjaxError } from "discourse/lib/ajax-error"; export default Ember.Controller.extend(GrantBadgeController, { adminUser: Ember.inject.controller(), @@ -70,9 +71,8 @@ export default Ember.Controller.extend(GrantBadgeController, { } }); }, - function() { - // Failure - bootbox.alert(I18n.t("generic_error")); + function(error) { + popupAjaxError(error); } ); }, diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb index b3852a6a77e..cb67ee7b423 100644 --- a/app/controllers/user_badges_controller.rb +++ b/app/controllers/user_badges_controller.rb @@ -58,7 +58,7 @@ class UserBadgesController < ApplicationController if params[:reason].present? unless is_badge_reason_valid? params[:reason] - return render json: { failed: I18n.t('invalid_grant_badge_reason_link') }, status: 400 + return render json: failed_json.merge(message: I18n.t('invalid_grant_badge_reason_link')), status: 400 end path = begin