From 30a804691b6b388c726e2c25ff3afed9770de80f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 25 Mar 2017 00:00:41 +0100 Subject: [PATCH] Fixed issue #851 - user "-" in notification in trigger changes. --- app/models/ticket.rb | 11 +++++++++-- app/models/transaction/trigger.rb | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/models/ticket.rb b/app/models/ticket.rb index 8034b67e3..213405800 100644 --- a/app/models/ticket.rb +++ b/app/models/ticket.rb @@ -715,8 +715,15 @@ perform changes on ticket group = self.group next if !group email_address = group.email_address - next if !email_address - next if !email_address.channel_id + if !email_address + logger.info "Unable to send trigger based notification to #{recipient_string} because no email address is set for group '#{group.name}'" + next + end + + if !email_address.channel_id + logger.info "Unable to send trigger based notification to #{recipient_string} because no channel is set for email address '#{email_address.email}' (id: #{email_address.id})" + next + end objects = { ticket: self, diff --git a/app/models/transaction/trigger.rb b/app/models/transaction/trigger.rb index 46408051d..33a504b72 100644 --- a/app/models/transaction/trigger.rb +++ b/app/models/transaction/trigger.rb @@ -44,7 +44,7 @@ class Transaction::Trigger original_user_id = UserInfo.current_user_id - Transaction.execute(reset_user_id: true, disable: ['Transaction::Trigger']) do + Transaction.execute(reset_user_id: true, disable: ['Transaction::Trigger', 'Transaction::Notification']) do triggers.each { |trigger| condition = trigger.condition