make 100% sure that the warning is accurate

This commit is contained in:
Robert Mathews 2015-11-11 14:07:06 -05:00
parent b3e1dbdfaf
commit 097c89bc60
2 changed files with 3 additions and 1 deletions

View File

@ -77,6 +77,7 @@ module PaperTrail
# Tells PaperTrail who is responsible for any changes that occur.
def set_paper_trail_whodunnit
@set_paper_trail_whodunnit_called=true
::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled_for_controller?
end
@ -90,7 +91,7 @@ module PaperTrail
enabled = ::PaperTrail.enabled_for_controller?
user_present = user_for_paper_trail.present?
whodunnit_blank = ::PaperTrail.whodunnit.blank?
if enabled && user_present && whodunnit_blank
if enabled && user_present && whodunnit_blank && !@set_paper_trail_whodunnit_called
warn <<-EOS.strip_heredoc
user_for_paper_trail is present, but whodunnit has not been set.
PaperTrail no longer adds the set_paper_trail_whodunnit

View File

@ -29,6 +29,7 @@ module PaperTrail
# Tells PaperTrail who is responsible for any changes that occur.
def set_paper_trail_whodunnit
@set_paper_trail_whodunnit_called=true
::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled?
end