diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-24 01:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-24 01:17:20 +0000 |
| commit | 167fe2ab08288ce286f5c7660ff0ed587b65b988 (patch) | |
| tree | 1a4c7d23cb3dd6993c0ce57a637a161e3405dba5 /app/controllers/admin/email_domain_blocks_controller.rb | |
| parent | faad820458401b5a01f24d4da4bf2acf59ef440d (diff) | |
| parent | e84fecb7e97851ed56f4d954e2d68128bb87da37 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/admin/email_domain_blocks_controller.rb')
| -rw-r--r-- | app/controllers/admin/email_domain_blocks_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb index 01058bf46..9fe85064e 100644 --- a/app/controllers/admin/email_domain_blocks_controller.rb +++ b/app/controllers/admin/email_domain_blocks_controller.rb @@ -20,6 +20,7 @@ module Admin @email_domain_block = EmailDomainBlock.new(resource_params) if @email_domain_block.save + log_action :create, @email_domain_block redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.created_msg') else render :new @@ -28,7 +29,8 @@ module Admin def destroy authorize @email_domain_block, :destroy? - @email_domain_block.destroy + @email_domain_block.destroy! + log_action :destroy, @email_domain_block redirect_to admin_email_domain_blocks_path, notice: I18n.t('admin.email_domain_blocks.destroyed_msg') end |