IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle invalid parameters and missing bounced emails

Browse Source
This commit is contained in:
Rafael dos Santos Silva
2017-03-02 20:37:28 -03:00
parent 5296f00c28
commit aac4a4ed94
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/controllers/modals/admin-incoming-email.js.es6
View File

@@ -2,6 +2,7 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality';
import IncomingEmail from 'admin/models/incoming-email';
import computed from 'ember-addons/ember-computed-decorators';
import { longDate } from 'discourse/lib/formatter';
import { popupAjaxError } from 'discourse/lib/ajax-error';
export default Ember.Controller.extend(ModalFunctionality, {
@@ -15,7 +16,12 @@ export default Ember.Controller.extend(ModalFunctionality, {
},
loadFromBounced(id) {
return IncomingEmail.findByBounced(id).then(result => this.set("model", result));
return IncomingEmail.findByBounced(id)
.then(result => this.set("model", result))
.catch(error => {
this.send("closeModal");
popupAjaxError(error);
});
}
});