Merge pull request #4716 from discourse/bounced_emails_details

FEATURE: Allow checking the raw response of a bounced email
This commit is contained in:
Rafael dos Santos Silva
2017-03-06 13:30:19 -03:00
committed by GitHub
6 changed files with 50 additions and 2 deletions
@@ -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, {
@@ -12,6 +13,15 @@ export default Ember.Controller.extend(ModalFunctionality, {
load(id) {
return IncomingEmail.find(id).then(result => this.set("model", result));
},
loadFromBounced(id) {
return IncomingEmail.findByBounced(id)
.then(result => this.set("model", result))
.catch(error => {
this.send("closeModal");
popupAjaxError(error);
});
}
});