summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-15 08:28:34 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-15 08:28:34 +0000
commit4e9fbeb8516581ddaf7a196f8dc0b710cbbce8aa (patch)
tree802754f9290459f930f24bd65f20edf2dda331bc /app
parent348a1d59efe207878384a75116bcc09928427556 (diff)
downloadredmine-4e9fbeb8516581ddaf7a196f8dc0b710cbbce8aa.tar.gz
redmine-4e9fbeb8516581ddaf7a196f8dc0b710cbbce8aa.zip
Possibility to define the default enable trackers when creating a project (#13175).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11394 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/settings_helper.rb2
-rw-r--r--app/models/project.rb7
-rw-r--r--app/views/settings/_projects.html.erb3
3 files changed, 10 insertions, 2 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 525b8d975..a01e29a3a 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -53,7 +53,7 @@ module SettingsHelper
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')
diff --git a/app/models/project.rb b/app/models/project.rb
index 478261b86..8b305f3d8 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -126,7 +126,12 @@ class Project < ActiveRecord::Base
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
diff --git a/app/views/settings/_projects.html.erb b/app/views/settings/_projects.html.erb
index 90db6b1ce..28fd9b578 100644
--- a/app/views/settings/_projects.html.erb
+++ b/app/views/settings/_projects.html.erb
@@ -6,6 +6,9 @@
<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,