Commit 66561031 authored by Felix Schäfer's avatar Felix Schäfer Committed by Eric Davis

[#400] Fix the event types (icons on activity and search views).

parent c778cc92
......@@ -39,7 +39,15 @@ class Issue < ActiveRecord::Base
acts_as_watchable
acts_as_journalized :event_title => Proc.new {|o| "#{o.tracker.name} ##{o.journaled_id} (#{o.status}): #{o.subject}"},
:event_type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '')}
:event_type => Proc.new {|o|
t = 'issue'
if o.changes.empty?
t << '-note' unless o.initial?
else
t << (IssueStatus.find_by_id(o.new_value_for(:status_id)).try(:is_closed?) ? '-closed' : '-edit')
end
t },
:except => [:description]
register_on_journal_formatter(:id, 'parent_id')
register_on_journal_formatter(:named_association, 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
......
......@@ -172,6 +172,7 @@ module Redmine
:anchor => ("note-#{journal.anchor}" unless journal.initial?) }
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
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