From ff318751493dbbc7513d2f9df84a1e5c04b4f7b9 Mon Sep 17 00:00:00 2001
From: Tim Felgentreff <timfelgentreff@gmail.com>
Date: Wed, 21 Jul 2010 17:57:45 +0200
Subject: [PATCH] move to STI for journals so the journals themselves can be
 events

---
 app/models/mail_handler.rb                                    | 2 +-
 app/models/mailer.rb                                          | 2 +-
 app/models/time_entry.rb                                      | 2 +-
 app/views/issues/_history.rhtml                               | 4 +++-
 .../lib/acts_as_activity_provider.rb                          | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index be3b5db1..ad71f756 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -197,7 +197,7 @@ class MailHandler < ActionMailer::Base
   # Reply will be added to the issue
   def receive_journal_reply(journal_id)
     journal = Journal.find_by_id(journal_id)
-    if journal && journal.versioned_type == 'Issue'
+    if journal && journal.versioned.is_a? Issue
       receive_issue_reply(journal.versioned_id)
     end
   end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index af35d8d1..83d7b7c1 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -67,7 +67,7 @@ class Mailer < ActionMailer::Base
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
-    s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
+    s << "(#{issue.status.name}) " if journal.details['status_id']
     s << issue.subject
     subject s
     body :issue => issue,
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index f606848a..46ab2d9d 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -26,7 +26,7 @@ class TimeEntry < ActiveRecord::Base
   attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
 
   acts_as_customizable
-  acts_as_journalized :event_title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
+  acts_as_journalized :event_title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).current_journal.event_title})"},
                 :event_url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project, :issue_id => o.issue}},
                 :event_author => :user,
                 :event_description => :comments
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 243c77bf..10db8f4f 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -9,7 +9,9 @@
     <% if journal.details.any? %>
     <ul class="details">
       <% for detail in journal.details %>
-       <li><%= journal.show_detail(detail) %></li>
+        <% if d = journal.show_detail(detail) %>
+          <li><%= d %></li>
+        <% end %>
       <% end %>
     </ul>
     <% end %>
diff --git a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
index c73a08b1..1f145a7b 100644
--- a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
+++ b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -73,7 +73,7 @@ module Redmine
             end
             
             with_scope(:find => scope_options) do
-              Journal.find(:all, provider_options[:find_options].dup)
+              journal_class.find(:all, provider_options[:find_options].dup)
             end
           end
         end