Merge branch 'ticket/unstable/400-activity-event-types' into unstable

6e105a76 · Eric Davis · c778cc92 · 078df723 · 6e105a76 · 6e105a76
Commit 6e105a76 authored May 20, 2011 by Eric Davis
Showing with 13 additions and 4 deletions

issue.rb app/models/issue.rb +8 -1

search_controller_test.rb test/functional/search_controller_test.rb +4 -3

acts_as_journalized.rb ...or/plugins/acts_as_journalized/lib/acts_as_journalized.rb +1 -0

No files found.
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -39,7 +39,14 @@ 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 }

  register_on_journal_formatter(:id, 'parent_id')
  register_on_journal_formatter(:named_association, 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',

--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -49,11 +49,12 @@ class SearchControllerTest < ActionController::TestCase
    get :index, :q => 'issue', :issues => 1
    assert_response :success
    assert_template 'index'
-    
+
    assert assigns(:results).include?(Issue.find(8))
    assert assigns(:results).include?(Issue.find(5))
-    assert_tag :dt, :attributes => { :class => /issue closed/ },
-                    :child => { :tag => 'a',  :content => /Closed/ }
+    assert_select "dt.issue" do
+      assert_select "a", :text => /Closed/
+    end
  end
  
  def test_search_project_and_subprojects

--- a/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb
+++ b/vendor/plugins/acts_as_journalized/lib/acts_as_journalized.rb
@@ -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