Make sure that the journal is not created if issue is saved.

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index edfe8575640c7c01f53c6c2b4f11290f0e730574..0c6ef2977ebe3d8bd4c5249b9855e23d31321d42 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -247,6 +247,8 @@ class Changeset < ActiveRecord::Base
       unless issue.save
         logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
       end
+    else
+      issue.clear_journal
     end
     issue
   end

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7d411fc9466d1b1c2f73fe238fb1381c34fed9eb..d5a43ed1811f57c803c07f50d387f5be68c3b68c 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -813,6 +813,11 @@ class Issue < ActiveRecord::Base
     @current_journal
   end
 
+  # Clears the current journal
+  def clear_journal
+    @current_journal = nil
+  end
+
   # Returns the names of attributes that are journalized when updating the issue
   def journalized_attribute_names
     names = Issue.column_names - %w(id root_id lft rgt lock_version created_on updated_on closed_on)