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
1cf08ee3
Commit
1cf08ee3
authored
Jun 17, 2011
by
Eric Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[#474] Changesets should use the author method for events
This will let them pick up the committer string if user is nil
parent
3d164f1d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
changeset.rb
app/models/changeset.rb
+1
-0
acts_as_journalized.rb
...or/plugins/acts_as_journalized/lib/acts_as_journalized.rb
+3
-2
No files found.
app/models/changeset.rb
View file @
1cf08ee3
...
...
@@ -23,6 +23,7 @@ class Changeset < ActiveRecord::Base
:event_description
=>
:long_comments
,
:event_datetime
=>
:committed_on
,
:event_url
=>
Proc
.
new
{
|
o
|
{
:controller
=>
'repositories'
,
:action
=>
'revision'
,
:id
=>
o
.
repository
.
project
,
:rev
=>
o
.
identifier
}},
:event_author
=>
Proc
.
new
{
|
o
|
o
.
author
},
:activity_timestamp
=>
"
#{
table_name
}
.committed_on"
,
:activity_find_options
=>
{
:include
=>
[
:user
,
{
:repository
=>
:project
}]}
acts_as_searchable
:columns
=>
'comments'
,
...
...
vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb
View file @
1cf08ee3
...
...
@@ -173,7 +173,8 @@ module Redmine
end
end
options
[
:type
]
||=
self
.
name
.
underscore
.
dasherize
# Make sure the name of the journalized model and not the name of the journal is used for events
{
:description
=>
:notes
,
:author
=>
:user
}.
reverse_merge
options
options
[
:author
]
||=
:user
{
:description
=>
:notes
}.
reverse_merge
options
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