From 3cdef3dd075fdd0a321d6da08ce12992e2a33433 Mon Sep 17 00:00:00 2001 From: Martin Fenner Date: Thu, 15 Nov 2018 01:21:34 +0100 Subject: [PATCH] correctly trigger delete confirmation emails. #138 --- app/controllers/clients_controller.rb | 2 +- app/controllers/providers_controller.rb | 2 +- app/models/client.rb | 1 - app/models/provider.rb | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/clients_controller.rb b/app/controllers/clients_controller.rb index 49f96fb3c..128b82a5d 100644 --- a/app/controllers/clients_controller.rb +++ b/app/controllers/clients_controller.rb @@ -116,7 +116,7 @@ def destroy logger.warn message render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status elsif @client.update_attributes(is_active: nil, deleted_at: Time.zone.now) - @client.remove_users(id: "client_id", jwt: current_user.jwt) unless Rails.env.test? + @client.send_delete_email unless Rails.env.test? head :no_content else logger.warn @client.errors.inspect diff --git a/app/controllers/providers_controller.rb b/app/controllers/providers_controller.rb index ed173c0b7..fb6e28f0f 100644 --- a/app/controllers/providers_controller.rb +++ b/app/controllers/providers_controller.rb @@ -130,7 +130,7 @@ def destroy logger.warn message render json: { errors: [{ status: status.to_s, title: message }] }.to_json, status: status elsif @provider.update_attributes(is_active: nil, deleted_at: Time.zone.now) - @provider.remove_users(id: "provider_id", jwt: current_user.jwt) unless Rails.env.test? + @provider.send_delete_email unless Rails.env.test? head :no_content else logger.warn @provider.errors.inspect diff --git a/app/models/client.rb b/app/models/client.rb index 64e4b0307..774d533e3 100644 --- a/app/models/client.rb +++ b/app/models/client.rb @@ -51,7 +51,6 @@ class Client < ActiveRecord::Base before_save { self.updated = Time.zone.now.utc.iso8601 } after_create :send_welcome_email, unless: Proc.new { Rails.env.test? } - before_destroy :send_delete_email, unless: Proc.new { Rails.env.test? } attr_accessor :target_id diff --git a/app/models/provider.rb b/app/models/provider.rb index d872a3759..ccb8cea59 100644 --- a/app/models/provider.rb +++ b/app/models/provider.rb @@ -54,7 +54,6 @@ class Provider < ActiveRecord::Base before_save { self.updated = Time.zone.now.utc.iso8601 } after_create :send_welcome_email, unless: Proc.new { Rails.env.test? } - before_destroy :send_delete_email, unless: Proc.new { Rails.env.test? } accepts_nested_attributes_for :prefixes