diff --git a/app/models/project.rb b/app/models/project.rb index 0119b1228..aba2ef4b5 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -122,7 +122,7 @@ class Project < ActiveRecord::Base self.enabled_module_names = Setting.default_projects_modules end if !initialized.key?('trackers') && !initialized.key?('tracker_ids') - default = Setting.default_projects_tracker_ids + default = Setting.default_projects_tracker_ids.presence if default.is_a?(Array) self.trackers = Tracker.where(:id => default.map(&:to_i)).sorted.to_a else diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb index 5198d040a..c60bad2bc 100644 --- a/test/unit/project_test.rb +++ b/test/unit/project_test.rb @@ -92,9 +92,9 @@ class ProjectTest < ActiveSupport::TestCase end end - def test_default_trackers_should_be_empty_with_empty_setting + def test_default_trackers_should_be_all_trackers_with_empty_setting with_settings :default_projects_tracker_ids => [] do - assert_equal [], Project.new.trackers + assert_equal Tracker.all.sort, Project.new.trackers.sort end end