diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 09:02:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-04-29 09:02:29 +0000 |
| commit | c2cd4b7f48bed9da259ebdeac767f92a7e92491b (patch) | |
| tree | b592ac3a31b5fc82fa285698f29eff77ffd05022 | |
| parent | 0b5b8bebd1ec2266b6fd1028da85a65d3addd15f (diff) | |
| download | redmine-c2cd4b7f48bed9da259ebdeac767f92a7e92491b.tar.gz redmine-c2cd4b7f48bed9da259ebdeac767f92a7e92491b.zip | |
Merged r5176 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5589 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | test/unit/project_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index dcf387612..24dbd2a79 100644 --- 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 0f5d552d0..d307500e3 100644 --- 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 |