From 72a396227ac59633da95542b4b1bd5d7f6bc0358 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 23 Jun 2009 20:17:47 +0000 Subject: [PATCH] Fixes default data loader broken by r2777 (#3507). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2792 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/default_data/loader.rb | 18 +++++++++--------- test/unit/default_data_test.rb | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb index a923b5783..3f1103ae3 100644 --- a/lib/redmine/default_data/loader.rb +++ b/lib/redmine/default_data/loader.rb @@ -156,17 +156,17 @@ module Redmine } # Enumerations - Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1) - Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2) + DocumentCategory.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1) + DocumentCategory.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2) - Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1) - Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true) - Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3) - Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4) - Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5) + IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1) + IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true) + IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3) + IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4) + IssuePriority.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5) - Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1) - Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2) + TimeEntryActivity.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1) + TimeEntryActivity.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2) end true end diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb index ae637ba39..457f885ee 100644 --- a/test/unit/default_data_test.rb +++ b/test/unit/default_data_test.rb @@ -38,6 +38,9 @@ class DefaultDataTest < Test::Unit::TestCase IssueStatus.delete_all Enumeration.delete_all assert Redmine::DefaultData::Loader::load(lang) + assert_not_nil DocumentCategory.first + assert_not_nil IssuePriority.first + assert_not_nil TimeEntryActivity.first rescue ActiveRecord::RecordInvalid => e assert false, ":#{lang} default data is invalid (#{e.message})." end -- 2.39.5