codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-24 08:09:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3483 from techAPJ/patch-1

Browse source 
FIX: show meaningful error message in case of site setting error
This commit is contained in:
Régis Hanol 2015-05-17 11:11:13 +02:00
commit ac74f2a1d3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/admin/components/site-setting.js.es6
View file

@ -65,8 +65,8 @@ export default Ember.Component.extend(BufferedContent, Discourse.ScrollTop, {
self.set('validationMessage', null); self.set('validationMessage', null);
self.commitBuffer(); self.commitBuffer();
}).catch(function(e) { }).catch(function(e) {
if (e.responseJSON && e.responseJSON.errors) { if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
self.set('validationMessage', e.responseJSON.errors[0]); self.set('validationMessage', e.jqXHR.responseJSON.errors[0]);
} else { } else {
self.set('validationMessage', I18n.t('generic_error')); self.set('validationMessage', I18n.t('generic_error'));
} }