From b9964e97a76fb64ee4997f0d6e5762b21d383721 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Sat, 13 Jan 2018 18:14:39 -0800 Subject: [PATCH] Don't log comment update action on delete --- app/models/comment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/comment.rb b/app/models/comment.rb index 04abff0f0..b4ac9f781 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -11,7 +11,7 @@ class Comment < ApplicationRecord before_validation :initialize_creator, :on => :create before_validation :initialize_updater after_create :update_last_commented_at_on_create - after_update(:if => lambda {|rec| CurrentUser.id != rec.creator_id}) do |rec| + after_update(:if => lambda {|rec| (!rec.is_deleted? || !rec.is_deleted_changed?) && CurrentUser.id != rec.creator_id}) do |rec| ModAction.log("comment ##{rec.id} updated by #{CurrentUser.name}") end after_save :update_last_commented_at_on_destroy, :if => lambda {|rec| rec.is_deleted? && rec.is_deleted_changed?}