diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6 index 0754952a011..aaa4759e827 100644 --- a/app/assets/javascripts/admin/components/flagged-post.js.es6 +++ b/app/assets/javascripts/admin/components/flagged-post.js.es6 @@ -13,15 +13,18 @@ export default Ember.Component.extend({ 'flaggedPost.deleted' ], + canAct: Ember.computed.alias('actableFilter'), + @computed('filter') - canAct(filter) { + actableFilter(filter) { return filter === 'active'; }, removeAfter(promise) { return promise.then(() => { this.attrs.removePost(); - }).catch(() => { + }).catch(error => { + if (error._discourse_displayed) { return; } bootbox.alert(I18n.t("admin.flags.error")); }); }, diff --git a/app/assets/javascripts/admin/templates/components/flagged-post.hbs b/app/assets/javascripts/admin/templates/components/flagged-post.hbs index 2b7f03940fc..0e7049f10d5 100644 --- a/app/assets/javascripts/admin/templates/components/flagged-post.hbs +++ b/app/assets/javascripts/admin/templates/components/flagged-post.hbs @@ -158,6 +158,6 @@ {{plugin-outlet name="flagged-post-below-controls" tagName="" - args=(hash flaggedPost=flaggedPost canAct=canAct)}} + args=(hash flaggedPost=flaggedPost canAct=canAct actableFilter=actableFilter)}}