diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 8a6d16f20bf77ee417dc476d01eeff73fa1f637f..1e80a7132ff5120560fb42ac82a673ba590b1d13 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -71,7 +71,7 @@ class ProjectsController < ApplicationController @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers? @project.trackers = Tracker.all @project.is_public = Setting.default_projects_public? - @project.enabled_module_names = Redmine::AccessControl.available_project_modules + @project.enabled_module_names = Setting.default_projects_modules else @project.enabled_module_names = params[:enabled_modules] if @project.save diff --git a/app/views/settings/_projects.rhtml b/app/views/settings/_projects.rhtml index 704905af2711defd9ee9a082859b1b5c94aea61d..9e94ed1414db8346b7215dfb66f3eabfadc3343e 100644 --- a/app/views/settings/_projects.rhtml +++ b/app/views/settings/_projects.rhtml @@ -6,6 +6,16 @@ <%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %> </p> +<p><label><%= l(:setting_default_projects_modules) %></label> +<%= hidden_field_tag 'settings[default_projects_modules][]', '' %> +<% Redmine::AccessControl.available_project_modules.each do |m| %> + <label class="block"> + <%= check_box_tag 'settings[default_projects_modules][]', m, Setting.default_projects_modules.include?(m.to_s) %> + <%= l_or_humanize(m, :prefix => "project_module_") %> + </label> +<% end %> +</p> + <p><label><%= l(:setting_sequential_project_identifiers) %></label> <%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %> <%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 69662dbab17d69dc3b0c5305f1bc012451e71fff..bd0243a54b14fdeb215bf31ff016ba27d4ed5eaf 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -833,3 +833,4 @@ bg: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 716df4385f91d00c730d598494f40cc677634895..b2d29ddf0efdb50101aa3ca0344e090514aaca59 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -857,3 +857,4 @@ bs: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 966df9a8fff357449580dc07b44cca139ee4409d..12a212001cd7e08296db40f7fd19b49d58fd493b 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -836,3 +836,4 @@ ca: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/cs.yml b/config/locales/cs.yml index c1533f62bc3b0557353a1cc08391c58e9a86d077..af8b16eb280ce47b39553f545131c3da3e45459e 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -839,3 +839,4 @@ cs: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/da.yml b/config/locales/da.yml index 4d433f44ca0101301bd42f61798fca8cae11af50..4028ad2d5805928093f0d610e7be986f15ab0db5 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -859,3 +859,4 @@ da: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/de.yml b/config/locales/de.yml index 425bcb575abd2fec078ad9155c70b2e231e80c80..dfe22ae8875620bd13499980a9d3eafac8f56c0b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -859,3 +859,4 @@ de: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/el.yml b/config/locales/el.yml index 032fa1cacdbe188a921f07bdf7e85013bdf5f511..ed31de7ba239dc04a9d65044ad526c20cafbe94c 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -839,3 +839,4 @@ el: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/en.yml b/config/locales/en.yml index 5bd70a420d81bf4bea8d557976b68db43a8b4287..0000e427e7d8dab48d53635cb9f89cedebf9de93 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -312,6 +312,7 @@ en: setting_openid: Allow OpenID login and registration setting_password_min_length: Minimum password length setting_new_project_user_role_id: Role given to a non-admin user who creates a project + setting_default_projects_modules: Default enabled modules for new projects permission_add_project: Create project permission_edit_project: Edit project diff --git a/config/locales/es.yml b/config/locales/es.yml index d03088d5c67f29d1c8602b7b55ba39b98da61408..2f8a764f1f4a078df681928019d82dd41f3725e4 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -880,3 +880,4 @@ es: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/fi.yml b/config/locales/fi.yml index acdee65a074cfb21eb536adb94258c0ffb6098c6..3745f6cfd19f10e7d287d31aa277c9f0af5641b3 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -869,3 +869,4 @@ fi: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index aaa858af588e1ea2cd3f6f32aa753cf148448c8e..4a32fc373ba00dda69c443487463728efcbdb23a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -334,6 +334,7 @@ fr: setting_openid: "Autoriser l'authentification et l'enregistrement OpenID" setting_password_min_length: Longueur minimum des mots de passe setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet + setting_default_projects_modules: Modules activés par défaut pour les nouveaux projets permission_add_project: Créer un projet permission_edit_project: Modifier le projet diff --git a/config/locales/gl.yml b/config/locales/gl.yml index e6f260ae660041e2be638c0b8ed0293218acac72..99154d3975bb2e870fef4f1bc6f032de3250c8c1 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -859,3 +859,4 @@ gl: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/he.yml b/config/locales/he.yml index 16d6800df9cfdcd17b77916be4386da9c91202a8..d9096865e9a1dada0f4e40f91f322a60c76c3aec 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -843,3 +843,4 @@ he: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 1c9f7f0cf7caa720370764b082f625534552d40b..c683956161359d2db4e3dce927602c807c9154d2 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -864,3 +864,4 @@ error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/it.yml b/config/locales/it.yml index 74132a60a86820b8effc9a109bf6836f6f0e8091..781ad30e353a6b14eebe77b9f6731c3887b4393b 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -846,3 +846,4 @@ it: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 1cdb14f8ee3a1be38f8d641785dfbd5eaf21ed2c..4f9ab13dd6d584abfc4dd4fe5349298beceb31e3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -868,3 +868,4 @@ ja: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a5b08607d2f8cd1fcc41c1a9ded7c72e425958a1..ec2330e42b8e7752636ca709d9ce5598a8439fe6 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -899,3 +899,4 @@ ko: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 67e65a57004d4e7e57a50fc8072a305b6b2ef580..269f7338174b7b7281f9fd2b7707043652df7c3a 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -869,3 +869,4 @@ lt: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 191738fd03394e761c3f3277a2079405a11edb17..9ef2162be69d5c657285a93276980888fd443791 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -821,3 +821,4 @@ nl: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/no.yml b/config/locales/no.yml index 6fa2be0fe49f5e48ee8060991c9e41640713766c..4c1f326ffced50bf13d3c542e82896bb3dd22ae9 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -834,3 +834,4 @@ error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 104a568a8a86d033da445261c14d55ca7ef93ef3..12649ac39aef9cb9d17674db9aeff3b9dbd7af97 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -862,3 +862,4 @@ pl: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 10d43a66c5b55db53c18aab137e54692f4f008bb..88fa840d0b27c6695f48463fab56c63c501a952e 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -865,3 +865,4 @@ pt-BR: error_can_not_reopen_issue_on_closed_version: Uma tarefa atribuÃda a uma versão fechada não pode ser reaberta label_user_anonymous: Anônimo button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c0133116c583f8dcf1d2d6f10351891173e9daeb..3e5bd81a38068d01032e6cc5661f157cdb6e37da 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -851,3 +851,4 @@ pt: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 9a97febd5694d0c9428c3251543166d2df20559f..c3d1e116b05c176afc46def628ee213faa1002f3 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -836,3 +836,4 @@ ro: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 84f06e8fb1d9451142e217f92ffe2650b2d5e33c..1f0d01c11fb878ead77c12bec6b89ae20591bf16 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -947,3 +947,4 @@ ru: error_can_not_reopen_issue_on_closed_version: Задача, Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ð°Ñ Ðº закрытой верÑии, не Ñможет быть открыта Ñнова label_user_anonymous: Ðноним button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 8f79cb3674cfd9a51c7289570974d839f0147596..cd19e91b08a3ddb0a18837ccfec81deab2cc14a0 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -838,3 +838,4 @@ sk: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 9ebcb6c401d46d3cdfadf426d92389d89bfc5f38..5f3db50c66d0852396f744ac6392c9d1ea501464 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -835,3 +835,4 @@ sl: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/sr.yml b/config/locales/sr.yml index dbd0c316e05167fc0aeb9342bdf8d6e4baccfece..38d501e4c2f6cb2d07771370b31b889af46879a6 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -854,3 +854,4 @@ error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 807db8db4d42fedd61c066c0ef751dd96a8faa1d..d82d220994339b29055d86433e2a47da47096de6 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -887,3 +887,4 @@ sv: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/th.yml b/config/locales/th.yml index 3ca9c46f91bd69290515ad71be71886dbaaa124d..c4474ccced3e5fbaa2a8c61b6e8505343f9d5330 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -836,3 +836,4 @@ th: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 01e2843915efa5ad30d6ccaef1f0709af0a743a6..0ae8c544f69f67f1383d07c89d0d81805cdcd462 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -866,3 +866,4 @@ tr: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/uk.yml b/config/locales/uk.yml index f7f2a66fc9bc094268378916a9b36b3e87400dd8..93b3722667fc1e26d54f7fea28fe09b4de65fcc6 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -835,3 +835,4 @@ uk: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/vi.yml b/config/locales/vi.yml index b12cba75b0b6debc9ccda607fcd1bcf55d965d63..28c7ab6903af6d8635b6cac34d146b3c6eba46ef 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -898,3 +898,4 @@ vi: error_can_not_reopen_issue_on_closed_version: An issue assigned to a closed version can not be reopened label_user_anonymous: Anonymous button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 494e5c808ed164a734e0630217f4767d0bd03279..c63674fd10773afb5cf3562fe36cffa2164e9127 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -930,3 +930,4 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f1c772fc11ed70b4a17e7c63fa8d28040ca04207..ecd1408df8b8be675543c24077c036b0b2141425 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -863,3 +863,4 @@ zh: enumeration_activities: 活动(时间跟踪) enumeration_system_activity: 系统活动 button_move_and_follow: Move and follow + setting_default_projects_modules: Default enabled modules for new projects diff --git a/config/settings.yml b/config/settings.yml index e0950c51037f129dbf724718a3f57aeffa30d7bb..f529d02013937b4fe68432c9005efae07e2e51b7 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -131,6 +131,17 @@ display_subprojects_issues: default: 1 default_projects_public: default: 1 +default_projects_modules: + serialized: true + default: + - issue_tracking + - time_tracking + - news + - documents + - files + - wiki + - repository + - boards # Role given to a non-admin user who creates a project new_project_user_role_id: format: int diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 5042c1282f8e11ce074f6b78bfb73bfb6256ac49..cf344900f759ccab078e9a48983a98a13b6c59cb 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -325,7 +325,7 @@ width: 270px; .tabular label.block{ font-weight: normal; -margin-left: 0px; +margin-left: 0px !important; text-align: left; float: none; display: block;