From 1cf08ee300e7acf51cdd481ca5e6eec3aef1b318 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Fri, 17 Jun 2011 12:29:04 -0700 Subject: [PATCH] [#474] Changesets should use the author method for events This will let them pick up the committer string if user is nil --- app/models/changeset.rb | 1 + .../plugins/acts_as_journalized/lib/acts_as_journalized.rb | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index d6ab9142..5294b05c 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -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', diff --git a/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb b/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb index 7a3b7b45..fd89cf63 100644 --- a/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb +++ b/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb @@ -173,10 +173,11 @@ 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 end end -end \ No newline at end of file +end