From 381784ea62ded426d268678b01226d49650800c0 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 21 May 2015 16:05:48 -0400
Subject: [PATCH] FIX: Display proper error on badge create
---
.../javascripts/admin/controllers/admin-badges-show.js.es6 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
index f955e2217a5..ac648462b26 100644
--- a/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-badges-show.js.es6
@@ -1,3 +1,4 @@
+import { popupAjaxError } from 'discourse/lib/ajax-error';
import BufferedContent from 'discourse/mixins/buffered-content';
export default Ember.ObjectController.extend(BufferedContent, {
@@ -64,11 +65,9 @@ export default Ember.ObjectController.extend(BufferedContent, {
self.set('savingStatus', I18n.t('saved'));
}
- }).catch(function(error) {
- self.set('savingStatus', I18n.t('failed'));
- self.send('saveError', error);
- }).finally(function() {
+ }).catch(popupAjaxError).finally(function() {
self.set('saving', false);
+ self.set('savingStatus', '');
});
}
},