Don't create a journal when creating an issue.

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

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 681bd9b94617581629ffa4a89a0ffe24bc399173..76731986c42e55c4e921dd84dd6b14db8d07fbf0 100644 (file)
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -52,10 +52,13 @@ class Journal < ActiveRecord::Base
 
   def initialize(*args)
     super
-    if journalized && journalized.new_record?
-      self.notify = false
+    if journalized
+      if journalized.new_record?
+        self.notify = false
+      else
+        start
+      end
     end
-    start
   end
 
   def save(*args)

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 566cf3ec880c840aed3a803c59a6afd21e523cfe..91a9bc6e8dd08ea048074c4472a05daa686a8e05 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1799,7 +1799,8 @@ class IssuesControllerTest < ActionController::TestCase
   def test_post_create
     @request.session[:user_id] = 2
     assert_difference 'Issue.count' do
-      post :create, :project_id => 1,
+      assert_no_difference 'Journal.count' do
+        post :create, :project_id => 1,
                  :issue => {:tracker_id => 3,
                             :status_id => 2,
                             :subject => 'This is the test_new issue',
@@ -1808,6 +1809,7 @@ class IssuesControllerTest < ActionController::TestCase
                             :start_date => '2010-11-07',
                             :estimated_hours => '',
                             :custom_field_values => {'2' => 'Value for field 2'}}
+      end
     end
     assert_redirected_to :controller => 'issues', :action => 'show', :id => Issue.last.id