jro_apps/redmine Commit - r1909:925ef8f4f038

Fixed: the default status is lost when reordering issue statuses (#1955)....

Jean-Philippe Lang -

r1909:925ef8f4f038

parent child

Context file:

r1909:925ef8f4f038

Collapse all files

app/models/issue_status.rb +2 -2

              # redMine - project management software
              # Copyright (C) 2006  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class IssueStatus < ActiveRecord::Base
                before_destroy :check_integrity
                has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
                acts_as_list
                validates_presence_of :name
                validates_uniqueness_of :name
                validates_length_of :name, :maximum => 30
                validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-               def before_save
-                 IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?
+               def after_save
+                 IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?
                end
                # Returns the default status for new issues
                def self.default
                  find(:first, :conditions =>["is_default=?", true])
                end
                # Returns an array of all statuses the given role can switch to
                # Uses association cache when called more than one time
                def new_statuses_allowed_to(role, tracker)
                  new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
                  new_statuses ? new_statuses.compact.sort{|x, y| x.position <=> y.position } : []
                end
                # Same thing as above but uses a database query
                # More efficient than the previous method if called just once
                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 }.compact  if role && tracker
                  new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
                end
                def new_status_allowed_to?(status, role, tracker)
                  status && role && tracker ?
                    !workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => role.id, :tracker_id => tracker.id}).nil? :
                    false
                end
                def <=>(status)
                  position <=> status.position
                end
                def to_s; name end
              private
                def check_integrity
                  raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])
                end
              end

test/unit/issue_status_test.rb +7 0

              # redMine - project management software
              # Copyright (C) 2006-2007  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.dirname(__FILE__) + '/../test_helper'
              class IssueStatusTest < Test::Unit::TestCase
                fixtures :issue_statuses
                def test_create
                  status = IssueStatus.new :name => "Assigned"
                  assert !status.save
                  # status name uniqueness
                  assert_equal 1, status.errors.count
                  status.name = "Test Status"
                  assert status.save
                  assert !status.is_default
                end
                def test_default
                  status = IssueStatus.default
                  assert_kind_of IssueStatus, status
                end
                def test_change_default
                  status = IssueStatus.find(2)
                  assert !status.is_default
                  status.is_default = true
                  assert status.save
                  status.reload
                  assert_equal status, IssueStatus.default
                  assert !IssueStatus.find(1).is_default
                end
+               def test_reorder_should_not_clear_default_status
+                 status = IssueStatus.default
+                 status.move_to_bottom
+                 status.reload
+                 assert status.is_default?
+               end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages