Browse Source

Added :dependent => :delete_all on IssueStatus Workflow association.

Also added compact in find_new_statuses_allowed_to to remove nil statuses.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@558 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/0.5.1
Jean-Philippe Lang 17 years ago
parent
commit
4dddb606a6
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      app/models/issue_status.rb

+ 2
- 2
app/models/issue_status.rb View File

@@ -17,7 +17,7 @@

class IssueStatus < ActiveRecord::Base
before_destroy :check_integrity
has_many :workflows, :foreign_key => "old_status_id"
has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
acts_as_list

validates_presence_of :name
@@ -47,7 +47,7 @@ class IssueStatus < ActiveRecord::Base
def find_new_statuses_allowed_to(role, tracker)
new_statuses = workflows.find(:all,
:include => :new_status,
:conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status } if role && tracker
:conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }.compact if role && tracker
new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
end

Loading…
Cancel
Save