jro_apps/redmine Commit - r11164:4e9fbeb85165

Possibility to define the default enable trackers when creating a project (#13175)....

Jean-Philippe Lang -

r11164:4e9fbeb85165

parent child

Context file:

r11164:4e9fbeb85165

app/helpers/settings_helper.rb +1 -1

                       check_box_tag(
                          "settings[#{setting}][]",
                          value,
-                         Setting.send(setting).include?(value),
+                         setting_values.include?(value),
                          :id => nil
                        ) + text.to_s,
                       :class => (options[:inline] ? 'inline' : 'block')

app/models/project.rb +6 -1

                   self.enabled_module_names = Setting.default_projects_modules
                 end
                 if !initialized.key?('trackers') && !initialized.key?('tracker_ids')
-                  self.trackers = Tracker.sorted.all
+                  default = Setting.default_projects_tracker_ids
+                  if default.is_a?(Array)
+                    self.trackers = Tracker.where(:id => default.map(&:to_i)).sorted.all
+                  else
+                    self.trackers = Tracker.sorted.all
+                  end
                 end
               end

app/views/settings/_projects.html.erb +3 0

             <p><%= setting_multiselect(:default_projects_modules,
                     Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %></p>
+            <p><%= setting_multiselect(:default_projects_tracker_ids,
+                    Tracker.sorted.all.collect {|t| [t.name, t.id.to_s]}) %></p>
             <p><%= setting_check_box :sequential_project_identifiers %></p>
             <p><%= setting_select :new_project_user_role_id,

config/settings.yml +3 0

               - boards
               - calendar
               - gantt
+            default_projects_tracker_ids:
+              serialized: true
+              default:
             # Role given to a non-admin user who creates a project
             new_project_user_role_id:
               format: int

test/test_helper.rb +9 -1

@@ -87,7 +87,15 class ActiveSupport::TestCase
87	end	87	end
88		88
89	def with_settings(options, &block)	89	def with_settings(options, &block)
90	saved_settings = options.keys.inject({}) {\|h, k\| h[k] = Setting[k].is_a?(Symbol) ? Setting[k] : Setting[k].dup; h}	90	saved_settings = options.keys.inject({}) do \|h, k\|
		91	h[k] = case Setting[k]
		92	when Symbol, false, true, nil
		93	Setting[k]
		94	else
		95	Setting[k].dup
		96	end
		97	h
		98	end
91	options.each {\|k, v\| Setting[k] = v}	99	options.each {\|k, v\| Setting[k] = v}
92	yield	100	yield
93	ensure	101	ensure

test/unit/project_test.rb +23 -2

@@ -74,9 +74,30 class ProjectTest < ActiveSupport::TestCase
74	with_settings :default_projects_modules => ['issue_tracking', 'repository'] do	74	with_settings :default_projects_modules => ['issue_tracking', 'repository'] do
75	assert_equal ['issue_tracking', 'repository'], Project.new.enabled_module_names	75	assert_equal ['issue_tracking', 'repository'], Project.new.enabled_module_names
76	end	76	end
		77	end
		78
		79	def test_default_trackers_should_match_default_tracker_ids_setting
		80	with_settings :default_projects_tracker_ids => ['1', '3'] do
		81	assert_equal Tracker.find(1, 3).sort, Project.new.trackers.sort
		82	end
		83	end
77		84
78	assert_equal Tracker.all.sort, Project.new.trackers.sort	85	def test_default_trackers_should_be_all_trackers_with_blank_setting
79	assert_equal Tracker.find(1, 3).sort, Project.new(:tracker_ids => [1, 3]).trackers.sort	86	with_settings :default_projects_tracker_ids => nil do
		87	assert_equal Tracker.all.sort, Project.new.trackers.sort
		88	end
		89	end
		90
		91	def test_default_trackers_should_be_empty_with_empty_setting
		92	with_settings :default_projects_tracker_ids => [] do
		93	assert_equal [], Project.new.trackers
		94	end
		95	end
		96
		97	def test_default_trackers_should_not_replace_initialized_trackers
		98	with_settings :default_projects_tracker_ids => ['1', '3'] do
		99	assert_equal Tracker.find(1, 2).sort, Project.new(:tracker_ids => [1, 2]).trackers.sort
		100	end
80	end	101	end
81		102
82	def test_update	103	def test_update

General Comments 0

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

No TODOs yet

	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