Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
OHR Support
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
97
Issues
97
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
OHR Support
Commits
bf13b0f4
Commit
bf13b0f4
authored
Jul 31, 2011
by
Eric Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for journal_user, then updated_by, and finally User.current when creating Journals
parent
68526f6f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
users.rb
...acts_as_journalized/lib/redmine/acts/journalized/users.rb
+1
-1
No files found.
vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/users.rb
View file @
bf13b0f4
...
...
@@ -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_id
=>
updated_by
.
try
(
:id
)
||
User
.
current
.
try
(
:id
))
journal_attributes_without_user
.
merge
(
:user_id
=>
journal_user
.
try
(
:id
)
||
updated_by
.
try
(
:id
)
||
User
.
current
.
try
(
:id
))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment