jro_apps/redmine Commit - r2121:c6511849987c

Fixed: default flag removed when editing a default enumeration (#2327)....

Jean-Philippe Lang -

r2121:c6511849987c

parent child

Context file:

r2121:c6511849987c

Collapse all files

app/models/enumeration.rb +3 -1

             # 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 Enumeration < ActiveRecord::Base
               acts_as_list :scope => 'opt = \'#{opt}\''
               before_destroy :check_integrity
               validates_presence_of :opt, :name
               validates_uniqueness_of :name, :scope => [:opt]
               validates_length_of :name, :maximum => 30
               # Single table inheritance would be an option
               OPTIONS = {
                 "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},
                 "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},
                 "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}
               }.freeze
               def self.get_values(option)
                 find(:all, :conditions => {:opt => option}, :order => 'position')
               end
               def self.default(option)
                 find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')
               end
               def option_name
                 OPTIONS[self.opt][:label]
               end
               def before_save
-                Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
+                if is_default? && is_default_changed?
+                  Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt})
+                end
               end
               def objects_count
                 OPTIONS[self.opt][:model].count(:conditions => "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
               end
               def in_use?
                 self.objects_count != 0
               end
               alias :destroy_without_reassign :destroy
               # Destroy the enumeration
               # If a enumeration is specified, objects are reassigned
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(Enumeration)
                   OPTIONS[self.opt][:model].update_all("#{OPTIONS[self.opt][:foreign_key]} = #{reassign_to.id}", "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
                 end
                 destroy_without_reassign
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
             private
               def check_integrity
                 raise "Can't delete enumeration" if self.in_use?
               end
             end

test/unit/enumeration_test.rb +37 0

             # redMine - project management software
             # Copyright (C) 2006-2008  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 EnumerationTest < Test::Unit::TestCase
               fixtures :enumerations, :issues
               def setup
               end
               def test_objects_count
                 # low priority
                 assert_equal 5, Enumeration.find(4).objects_count
                 # urgent
                 assert_equal 0, Enumeration.find(7).objects_count
               end
               def test_in_use
                 # low priority
                 assert Enumeration.find(4).in_use?
                 # urgent
                 assert !Enumeration.find(7).in_use?
               end
+              def test_default
+                e = Enumeration.default('IPRI')
+                assert e.is_a?(Enumeration)
+                assert e.is_default?
+                assert_equal 'Normal', e.name
+              end
+              def test_create
+                e = Enumeration.new(:opt => 'IPRI', :name => 'Very urgent', :is_default => false)
+                assert e.save
+                assert_equal 'Normal', Enumeration.default('IPRI').name
+              end
+              def test_create_as_default
+                e = Enumeration.new(:opt => 'IPRI', :name => 'Very urgent', :is_default => true)
+                assert e.save
+                assert_equal e, Enumeration.default('IPRI')
+              end
+              def test_update_default
+                e = Enumeration.default('IPRI')
+                e.update_attributes(:name => 'Changed', :is_default => true)
+                assert_equal e, Enumeration.default('IPRI')
+              end
+              def test_update_default_to_non_default
+                e = Enumeration.default('IPRI')
+                e.update_attributes(:name => 'Changed', :is_default => false)
+                assert_nil Enumeration.default('IPRI')
+              end
+              def test_change_default
+                e = Enumeration.find_by_name('Urgent')
+                e.update_attributes(:name => 'Urgent', :is_default => true)
+                assert_equal e, Enumeration.default('IPRI')
+              end
               def test_destroy_with_reassign
                 Enumeration.find(4).destroy(Enumeration.find(6))
                 assert_nil Issue.find(:first, :conditions => {:priority_id => 4})
                 assert_equal 5, Enumeration.find(6).objects_count
               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