From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Jul 2010 10:49:08 +0000 (+0000)
Subject: Merged r3881 from trunk.
X-Git-Tag: 1.0.1~75
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=52a12aaca884e1389ac0867dc91200c63d73f41a;p=redmine.git

Merged r3881 from trunk.

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

diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index fdda12a8c..f376d5d15 100644
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -17,8 +17,10 @@
 
 class IssueStatus < ActiveRecord::Base
   before_destroy :check_integrity  
-  has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
+  has_many :workflows, :foreign_key => "old_status_id"
   acts_as_list
+  
+  before_destroy :delete_workflows
 
   validates_presence_of :name
   validates_uniqueness_of :name
@@ -89,4 +91,9 @@ private
   def check_integrity
     raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
   end
+  
+  # Deletes associated workflows
+  def delete_workflows
+    Workflow.delete_all(["old_status_id = :id OR new_status_id = :id", {:id => id}])
+  end
 end
diff --git a/test/unit/issue_status_test.rb b/test/unit/issue_status_test.rb
index 2c0685cec..bcc50a480 100644
--- a/test/unit/issue_status_test.rb
+++ b/test/unit/issue_status_test.rb
@@ -32,10 +32,12 @@ class IssueStatusTest < ActiveSupport::TestCase
   end
   
   def test_destroy
-    count_before = IssueStatus.count
     status = IssueStatus.find(3)
-    assert status.destroy
-    assert_equal count_before - 1, IssueStatus.count
+    assert_difference 'IssueStatus.count', -1 do
+      assert status.destroy
+    end
+    assert_nil Workflow.first(:conditions => {:old_status_id => status.id})
+    assert_nil Workflow.first(:conditions => {:new_status_id => status.id})
   end
 
   def test_destroy_status_in_use