jro_apps/redmine Commit - r3126:8db9ecef08ee

Removes column opt in enumerations table....

Jean-Philippe Lang -

r3126:8db9ecef08ee

parent child

Context file:

r3126:8db9ecef08ee

Collapse all files

db/migrate/20091225164732_remove_enumerations_opt.rb created 644 +12 0

@@ -0,0 +1,12
	1	class RemoveEnumerationsOpt < ActiveRecord::Migration
	2	def self.up
	3	remove_column :enumerations, :opt
	4	end
	5
	6	def self.down
	7	add_column :enumerations, :opt, :string, :limit => 4, :default => '', :null => false
	8	Enumeration.update_all("opt = 'IPRI'", "type = 'IssuePriority'")
	9	Enumeration.update_all("opt = 'DCAT'", "type = 'DocumentCategory'")
	10	Enumeration.update_all("opt = 'ACTI'", "type = 'TimeEntryActivity'")
	11	end
	12	end

app/models/document_category.rb 0 -2

               has_many :documents, :foreign_key => 'category_id'
               OptionName = :enumeration_doc_categories
-              # Backwards compatiblity.  Can be removed post-0.9
-              OptName = 'DCAT'
               def option_name
                 OptionName

app/models/enumeration.rb 0 -36

@@ -29,36 +29,6 class Enumeration < ActiveRecord::Base
29	validates_presence_of :name	29	validates_presence_of :name
30	validates_uniqueness_of :name, :scope => [:type, :project_id]	30	validates_uniqueness_of :name, :scope => [:type, :project_id]
31	validates_length_of :name, :maximum => 30	31	validates_length_of :name, :maximum => 30
32
33	# Backwards compatiblity named_scopes.
34	# Can be removed post-0.9
35	named_scope :priorities, :conditions => { :type => "IssuePriority" }, :order => 'position' do
36	ActiveSupport::Deprecation.warn("Enumeration#priorities is deprecated, use the IssuePriority class. (#{Redmine::Info.issue(3007)})")
37	def default
38	find(:first, :conditions => { :is_default => true })
39	end
40	end
41
42	named_scope :document_categories, :conditions => { :type => "DocumentCategory" }, :order => 'position' do
43	ActiveSupport::Deprecation.warn("Enumeration#document_categories is deprecated, use the DocumentCategories class. (#{Redmine::Info.issue(3007)})")
44	def default
45	find(:first, :conditions => { :is_default => true })
46	end
47	end
48
49	named_scope :activities, :conditions => { :type => "TimeEntryActivity" }, :order => 'position' do
50	ActiveSupport::Deprecation.warn("Enumeration#activities is deprecated, use the TimeEntryActivity class. (#{Redmine::Info.issue(3007)})")
51	def default
52	find(:first, :conditions => { :is_default => true })
53	end
54	end
55
56	named_scope :values, lambda {\|type\| { :conditions => { :type => type }, :order => 'position' } } do
57	def default
58	find(:first, :conditions => { :is_default => true })
59	end
60	end
61	# End backwards compatiblity named_scopes
62		32
63	named_scope :shared, :conditions => { :project_id => nil }	33	named_scope :shared, :conditions => { :project_id => nil }
64	named_scope :active, :conditions => { :active => true }	34	named_scope :active, :conditions => { :active => true }
@@ -80,12 +50,6 class Enumeration < ActiveRecord::Base
80	nil	50	nil
81	end	51	end
82		52
83	# Backwards compatiblity. Can be removed post-0.9
84	def opt
85	ActiveSupport::Deprecation.warn("Enumeration#opt is deprecated, use the STI classes now. (#{Redmine::Info.issue(3007)})")
86	return OptName
87	end
88
89	def before_save	53	def before_save
90	if is_default? && is_default_changed?	54	if is_default? && is_default_changed?
91	Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type})	55	Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type})

app/models/issue_priority.rb 0 -2

               has_many :issues, :foreign_key => 'priority_id'
               OptionName = :enumeration_issue_priorities
-              # Backwards compatiblity.  Can be removed post-0.9
-              OptName = 'IPRI'
               def option_name
                 OptionName

app/models/time_entry_activity.rb 0 -2

               has_many :time_entries, :foreign_key => 'activity_id'
               OptionName = :enumeration_activities
-              # Backwards compatiblity.  Can be removed post-0.9
-              OptName = 'ACTI'
               def option_name
                 OptionName

lib/redmine/default_data/loader.rb +9 -9

                         }
                         # Enumerations
-                        DocumentCategory.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1)
+                        DocumentCategory.create!(:name => l(:default_doc_category_user), :position => 1)
-                        DocumentCategory.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2)
+                        DocumentCategory.create!(:name => l(:default_doc_category_tech), :position => 2)
-                        IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1)
+                        IssuePriority.create!(:name => l(:default_priority_low), :position => 1)
-                        IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true)
+                        IssuePriority.create!(:name => l(:default_priority_normal), :position => 2, :is_default => true)
-                        IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3)
+                        IssuePriority.create!(:name => l(:default_priority_high), :position => 3)
-                        IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4)
+                        IssuePriority.create!(:name => l(:default_priority_urgent), :position => 4)
-                        IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5)
+                        IssuePriority.create!(:name => l(:default_priority_immediate), :position => 5)
-                        TimeEntryActivity.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1)
+                        TimeEntryActivity.create!(:name => l(:default_activity_design), :position => 1)
-                        TimeEntryActivity.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2)
+                        TimeEntryActivity.create!(:name => l(:default_activity_development), :position => 2)
                       end
                       true
                     end

lib/tasks/migrate_from_mantis.rake +1 -1

 => closed_status    # closed
                                     }
-                  priorities = Enumeration.priorities
+                  priorities = IssuePriority.all
                   DEFAULT_PRIORITY = priorities[2]
                   PRIORITY_MAPPING = {10 => priorities[1], # none
 => priorities[1], # low

lib/tasks/migrate_from_trac.rake +1 -1

                                       'closed' => closed_status
                                       }
-                    priorities = Enumeration.priorities
+                    priorities = IssuePriority.all
                     DEFAULT_PRIORITY = priorities[0]
                     PRIORITY_MAPPING = {'lowest' => priorities[0],
                                         'low' => priorities[0],

test/fixtures/enumerations.yml 0 -14

             enumerations_001:
               name: Uncategorized
               id: 1
-              opt: DCAT
               type: DocumentCategory
               active: true
             enumerations_002:
               name: User documentation
               id: 2
-              opt: DCAT
               type: DocumentCategory
               active: true
             enumerations_003:
               name: Technical documentation
               id: 3
-              opt: DCAT
               type: DocumentCategory
               active: true
             enumerations_004:
               name: Low
               id: 4
-              opt: IPRI
               type: IssuePriority
               active: true
             enumerations_005:
               name: Normal
               id: 5
-              opt: IPRI
               type: IssuePriority
               is_default: true
               active: true
             enumerations_006:
               name: High
               id: 6
-              opt: IPRI
               type: IssuePriority
               active: true
             enumerations_007:
               name: Urgent
               id: 7
-              opt: IPRI
               type: IssuePriority
               active: true
             enumerations_008:
               name: Immediate
               id: 8
-              opt: IPRI
               type: IssuePriority
               active: true
             enumerations_009:
               name: Design
               id: 9
-              opt: ACTI
               type: TimeEntryActivity
               position: 1
               active: true
             enumerations_010:
               name: Development
               id: 10
-              opt: ACTI
               type: TimeEntryActivity
               position: 2
               is_default: true
             enumerations_011:
               name: QA
               id: 11
-              opt: ACTI
               type: TimeEntryActivity
               position: 3
               active: true
             enumerations_012:
               name: Default Enumeration
               id: 12
-              opt: ''
               type: Enumeration
               is_default: true
               active: true
             enumerations_013:
               name: Another Enumeration
               id: 13
-              opt: ''
               type: Enumeration
               active: true
             enumerations_014:
               name: Inactive Activity
               id: 14
-              opt: ACTI
               type: TimeEntryActivity
               position: 4
               active: false

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