Skip to content

O
OHR Support
Commit aa07982d authored by Eric Davis's avatar Eric Davis
Browse files
Options

Fix an edge-edge case bug in journal_attributes_for_user with different users 

In one case in a plugin (not able to reproduce in core) journal_attributes_for_user
would set the :user to something different than what's in updated_by thus assigning
the Journal to the wrong user.
parent db3480bd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/creation.rb
View file @ aa07982d
......@@ -120,8 +120,8 @@ module Redmine::Acts::Journalized
def journal_attributes
attributes = { :journaled_id => self.id, :activity_type => activity_type,
:changes => journal_changes, :version => last_version + 1,
:notes => journal_notes, :user_id => (journal_user.try(:id) || User.current) }
:notes => journal_notes, :user_id => (journal_user.try(:id) || User.current.try(:id)) }
end
end
end
end
\ No newline at end of file
end
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/users.rb
View file @ aa07982d
......@@ -57,7 +57,7 @@ module Redmine::Acts::Journalized
# Overrides the +journal_attributes+ method to include user information passed into the
# parent object, by way of a +updated_by+ attr_accessor.
def journal_attributes_with_user
journal_attributes_without_user.merge(:user => updated_by || User.current)
journal_attributes_without_user.merge(:user_id => updated_by.try(:id) || User.current.try(:id))
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment