Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3664 from tgxworld/use_popupAjaxError 

Use ajax-error in controller:topic.
This commit is contained in:
Sam 2015-08-19 09:29:36 +10:00
parent b38a1309f7 1c2f6b97c3
commit c20b3b85f9
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -4,6 +4,7 @@ import { spinnerHTML } from 'discourse/helpers/loading-spinner';
import Topic from 'discourse/models/topic'; import Topic from 'discourse/models/topic';
import Quote from 'discourse/lib/quote'; import Quote from 'discourse/lib/quote';
import { setting } from 'discourse/lib/computed'; import { setting } from 'discourse/lib/computed';
import { popupAjaxError } from 'discourse/lib/ajax-error';
import computed from 'ember-addons/ember-computed-decorators'; import computed from 'ember-addons/ember-computed-decorators';
export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
@ -201,14 +202,9 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
} }
]); ]);
} else { } else {
post.destroy(user).then(null, function(e) { post.destroy(user).catch(function(error) {
popupAjaxError(error);
post.undoDeleteState(); post.undoDeleteState();
const response = $.parseJSON(e.responseText);
if (response && response.errors) {
bootbox.alert(response.errors[0]);
} else {
bootbox.alert(I18n.t('generic_error'));
}
}); });
} }
}, },
@ -232,13 +228,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
return; return;
} }
if (post) { if (post) {
return post.toggleBookmark().catch(function(error) { return post.toggleBookmark().catch(popupAjaxError);
if (error && error.jqXHR && error.jqXHR.responseText) {
bootbox.alert($.parseJSON(error.jqXHR.responseText).errors[0]);
} else {
bootbox.alert(I18n.t('generic_error'));
}
});
} else { } else {
return this.get("model").toggleBookmark(); return this.get("model").toggleBookmark();
} }
@ -295,13 +285,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, {
// the properties to the topic. // the properties to the topic.
self.rollbackBuffer(); self.rollbackBuffer();
self.set('editingTopic', false); self.set('editingTopic', false);
}).catch(function(error) { }).catch(popupAjaxError);
if (error && error.jqXHR && error.jqXHR.responseText) {
bootbox.alert($.parseJSON(error.jqXHR.responseText).errors[0]);
} else {
bootbox.alert(I18n.t('generic_error'));
}
});
}, },
toggledSelectedPost(post) { toggledSelectedPost(post) {