diff --git a/app/assets/javascripts/admin/components/flagged-post.js.es6 b/app/assets/javascripts/admin/components/flagged-post.js.es6 index 132e1c80b3a..3019a1aae01 100644 --- a/app/assets/javascripts/admin/components/flagged-post.js.es6 +++ b/app/assets/javascripts/admin/components/flagged-post.js.es6 @@ -36,10 +36,6 @@ export default Ember.Component.extend({ this.removeAfter(promise); }, - showAgreeFlagModal() { - this._spawnModal('admin-agree-flag', this.get('flaggedPost'), 'agree-flag-modal'); - }, - showDeleteFlagModal() { this._spawnModal('admin-delete-flag', this.get('flaggedPost'), 'delete-flag-modal'); }, diff --git a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 b/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 deleted file mode 100644 index 07fbe0763c0..00000000000 --- a/app/assets/javascripts/admin/controllers/modals/admin-agree-flag.js.es6 +++ /dev/null @@ -1,21 +0,0 @@ -import ModalFunctionality from 'discourse/mixins/modal-functionality'; -import DeleteSpammerModal from 'admin/mixins/delete-spammer-modal'; - -export default Ember.Controller.extend(ModalFunctionality, DeleteSpammerModal, { - removeAfter: null, - - actions: { - agreeDeleteSpammer(user) { - return this.removeAfter(user.deleteAsSpammer()).then(() => { - this.send('closeModal'); - }); - }, - - perform(action) { - let flaggedPost = this.get('model'); - return this.removeAfter(flaggedPost.agreeFlags(action)).then(() => { - this.send('closeModal'); - }); - }, - } -}); diff --git a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs b/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs deleted file mode 100644 index b9d5a88383b..00000000000 --- a/app/assets/javascripts/admin/templates/modal/admin-agree-flag.hbs +++ /dev/null @@ -1,35 +0,0 @@ -{{#d-modal-body title="admin.flags.agree_flag_modal_title"}} - {{#if model.user_deleted}} - {{d-button - title="admin.flags.agree_flag_restore_post_title" - class="confirm-agree-restore" - action=(action "perform" "restore") - icon="eye" - label="admin.flags.agree_flag_restore_post"}} - {{else}} - {{#unless model.postHidden}} - {{d-button - title="admin.flags.agree_flag_hide_post_title" - action=(action "perform" "hide") - class="confirm-agree-hide" - icon="eye-slash" - label="admin.flags.agree_flag_hide_post"}} - {{/unless}} - {{/if}} - - {{d-button - title="admin.flags.agree_flag_title" - action=(action "perform" "keep") - class="confirm-agree-keep" - icon="thumbs-o-up" - label="admin.flags.agree_flag"}} - - {{#if canDeleteSpammer}} - {{d-button - title="admin.flags.delete_spammer_title" - action="deleteSpammer" - class="btn-danger delete-spammer" - icon="exclamation-triangle" - label="admin.flags.delete_spammer"}} - {{/if}} -{{/d-modal-body}} diff --git a/app/assets/stylesheets/common/admin/flagging.scss b/app/assets/stylesheets/common/admin/flagging.scss index 8867439f466..f2132ed8931 100644 --- a/app/assets/stylesheets/common/admin/flagging.scss +++ b/app/assets/stylesheets/common/admin/flagging.scss @@ -188,7 +188,7 @@ margin-bottom: 2em; } -.delete-flag-modal, .agree-flag-modal { +.delete-flag-modal { button { margin: 10px 0 10px 10px; padding: 10px 15px; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 53e18769a55..06d9484471b 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -220,7 +220,7 @@ margin-bottom: 10px; } -.delete-flag-modal, .agree-flag-modal { +.delete-flag-modal { .modal-inner-container { width: 400px; } diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 2adf1c67ccf..0643a007d1b 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -169,7 +169,7 @@ } } -.delete-flag-modal, .agree-flag-modal { +.delete-flag-modal { .modal-inner-container { width: 300px; }