Merged r5176 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5589 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/project.rb b/app/models/project.rb
index dcf38761292dba578eb93bdd39cc3ee9003fcf4d..24dbd2a7919ce9698dc6d94a5ded3e4cd27ee6b6 100644 (file)
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -43,7 +43,7 @@ class Project < ActiveRecord::Base
   has_many :time_entries, :dependent => :delete_all
   has_many :queries, :dependent => :delete_all
   has_many :documents, :dependent => :destroy
-  has_many :news, :dependent => :delete_all, :include => :author
+  has_many :news, :dependent => :destroy, :include => :author
   has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
   has_many :boards, :dependent => :destroy, :order => "position ASC"
   has_one :repository, :dependent => :destroy

diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 0f5d552d00df511caeadb9f9a320e867fceb5d29..d307500e3bc9ce3598ea9fac9e950f170fc66ae8 100644 (file)
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -204,7 +204,7 @@ class ProjectTest < ActiveSupport::TestCase
     assert_equal 0, Repository.count
     assert_equal 0, Changeset.count
     assert_equal 0, Change.count
-    #assert_equal 0, Comment.count
+    assert_equal 0, Comment.count
     assert_equal 0, TimeEntry.count
     assert_equal 0, Version.count
     assert_equal 0, Watcher.count