From 34ee9a96d6fe840c8a9b94a6a259b2df2506dd77 Mon Sep 17 00:00:00 2001 From: Jeffrey Dill Date: Mon, 9 Jul 2018 12:47:59 -0400 Subject: [PATCH] Clean up the conditional logic --- lib/audited/auditor.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/audited/auditor.rb b/lib/audited/auditor.rb index 1cf775791..018dfb9b2 100644 --- a/lib/audited/auditor.rb +++ b/lib/audited/auditor.rb @@ -271,15 +271,10 @@ def write_audit(attrs) end def eligible_for_comment_validation? - if !auditing_enabled || - (audited_options[:on].exclude?(:create) && self.new_record?) || - (audited_options[:on].exclude?(:update) && self.persisted?) || - (audited_changes.empty? && self.persisted?) - then - false - else - true - end + auditing_enabled && + ((audited_options[:on].include?(:create) && self.new_record?) || + (audited_options[:on].include?(:update) && self.persisted?)) && + !(audited_changes.empty? && self.persisted?) end def combine_audits_if_needed