Moved journal details generation to Journal model.

git-svn-id: http://svn.redmine.org/redmine/trunk@13703 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 102 insertions, 0 deletions

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 770e98585..681bd9b94 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -50,7 +50,16 @@ class Journal < ActiveRecord::Base
       where("(#{Journal.table_name}.private_notes = ? OR (#{Project.allowed_to_condition(user, :view_private_notes, *args)}))", false)
   }
 
+  def initialize(*args)
+    super
+    if journalized && journalized.new_record?
+      self.notify = false
+    end
+    start
+  end
+
   def save(*args)
+    journalize_changes
     # Do not save an empty journal
     (details.empty? && notes.blank?) ? false : super
   end
@@ -166,8 +175,101 @@ class Journal < ActiveRecord::Base
     journals
   end
 
+  # Stores the values of the attributes and custom fields of the journalized object
+  def start
+    if journalized
+      @attributes_before_change = journalized.journalized_attribute_names.inject({}) do |h, attribute|
+        h[attribute] = journalized.send(attribute)
+        h
+      end
+      @custom_values_before_change = journalized.custom_field_values.inject({}) do |h, c|
+        h[c.custom_field_id] = c.value
+        h
+      end
+    end
+    self
+  end
+
+  # Adds a journal detail for an attachment that was added or removed
+  def journalize_attachment(attachment, added_or_removed)
+    key = (added_or_removed == :removed ? :old_value : :value)
+    details << JournalDetail.new(
+        :property => 'attachment',
+        :prop_key => attachment.id,
+        key => attachment.filename
+      )
+  end
+
+  # Adds a journal detail for an issue relation that was added or removed
+  def journalize_relation(relation, added_or_removed)
+    key = (added_or_removed == :removed ? :old_value : :value)
+    details << JournalDetail.new(
+        :property  => 'relation',
+        :prop_key  => relation.relation_type_for(journalized),
+        key => relation.other_issue(journalized).try(:id)
+      )
+  end
+
   private
 
+  # Generates journal details for attribute and custom field changes
+  def journalize_changes
+    # attributes changes
+    if @attributes_before_change
+      journalized.journalized_attribute_names.each {|attribute|
+        before = @attributes_before_change[attribute]
+        after = journalized.send(attribute)
+        next if before == after || (before.blank? && after.blank?)
+        add_attribute_detail(attribute, before, after)
+      }
+    end
+    if @custom_values_before_change
+      # custom fields changes
+      journalized.custom_field_values.each {|c|
+        before = @custom_values_before_change[c.custom_field_id]
+        after = c.value
+        next if before == after || (before.blank? && after.blank?)
+
+        if before.is_a?(Array) || after.is_a?(Array)
+          before = [before] unless before.is_a?(Array)
+          after = [after] unless after.is_a?(Array)
+
+          # values removed
+          (before - after).reject(&:blank?).each do |value|
+            add_custom_value_detail(c, value, nil)
+          end
+          # values added
+          (after - before).reject(&:blank?).each do |value|
+            add_custom_value_detail(c, nil, value)
+          end
+        else
+          add_custom_value_detail(c, before, after)
+        end
+      }
+    end
+    start
+  end
+
+  # Adds a journal detail for an attribute change
+  def add_attribute_detail(attribute, old_value, value)
+    add_detail('attr', attribute, old_value, value)
+  end
+
+  # Adds a journal detail for a custom field value change
+  def add_custom_value_detail(custom_value, old_value, value)
+    add_detail('cf', custom_value.custom_field_id, old_value, value)
+  end
+
+  # Adds a journal detail
+  def add_detail(property, prop_key, old_value, value)
+    details << JournalDetail.new(
+        :property => property,
+        :prop_key => prop_key,
+        :old_value => old_value,
+        :value => value
+      )
+  end
+
   def split_private_notes
     if private_notes?
       if notes.present?