Adds a setting to choose which role is given to a non-admin user who creates a projec...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2754 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5f508cb5f417d984d2f34bcc00b1bd85c9ccfceb..355e1bd46b19729d4b03a5d42f6f611d978aaa5a 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -78,7 +78,8 @@ class ProjectsController < ApplicationController
         @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
         # Add current user as a project member if he is not admin
         unless User.current.admin?
-          m = Member.new(:user => User.current, :roles => Role.builtin(false).find(:all, :order => 'position', :limit => 1))
+          r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
+          m = Member.new(:user => User.current, :roles => [r])
           @project.members << m
         end
         flash[:notice] = l(:notice_successful_create)

diff --git a/app/models/role.rb b/app/models/role.rb
index a93c4eaca154694e518d1ee017f5234aa48cc13b..db582570257b1db013c0fc4e624fd101d890beb2 100644 (file)
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -20,6 +20,7 @@ class Role < ActiveRecord::Base
   BUILTIN_NON_MEMBER = 1
   BUILTIN_ANONYMOUS  = 2
 
+  named_scope :givable, { :conditions => "builtin = 0", :order => 'position' }
   named_scope :builtin, lambda { |*args|
     compare = 'not' if args.first == true
     { :conditions => "#{compare} builtin = 0" }

diff --git a/app/views/settings/_projects.rhtml b/app/views/settings/_projects.rhtml
index 1cd4f6e9b0cbd5ef9c7a180ea957807f527d65e6..510807d999da6ee7dc6d888aaddf887206cd3811 100644 (file)
--- a/app/views/settings/_projects.rhtml
+++ b/app/views/settings/_projects.rhtml
@@ -6,6 +6,9 @@
 
 <p><label><%= l(:setting_sequential_project_identifiers) %></label>
 <%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %><%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %></p>
+
+<p><label><%= l(:setting_new_project_user_role_id) %></label>
+<%= select_tag('settings[new_project_user_role_id]', options_for_select([["--- #{l(:actionview_instancetag_blank_option)} ---", '']] + Role.find_all_givable.collect {|r| [r.name, r.id]}, Setting.new_project_user_role_id)) %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 4a18f4939f8737757ce2bc8e2a73afe491a5c019..530b8f96f0d904911fb8efbfaf8f13a28d826a1e 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -797,3 +797,4 @@ bg:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 841a56759117eacbaf5bc7637d28483d53dcb016..d9cef694df4381960bce8334cd87e3420b8e5b40 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -830,3 +830,4 @@ bs:
   label_wiki_content_updated: Wiki page updated\r
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.\r
   permission_add_project: Create project\r
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project\r

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index a209a1e5a7fc2ad8bd2ddfa2a5d5ffda2e888768..de805a2bd476217a72c602013450a1e80005e79c 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -800,3 +800,4 @@ ca:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index cae51f951cdbc3b55961235cbe2da365c3e88dce..765b8a883ec71e7b41234dc915f59d2fa74f00f0 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -803,3 +803,4 @@ cs:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/da.yml b/config/locales/da.yml
index f388fc8c5a2241f94e4fd076128919cfc8ec39e8..430130f1c0901c48084ad0f8f50a1b22a4d6e727 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -830,3 +830,4 @@ da:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/de.yml b/config/locales/de.yml
index a6f56a2af18de4265b6b06db892d54aa08de9cf7..0ebcba0778c75eed330ba76f516a13b1268c21b5 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -829,3 +829,4 @@ de:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9cfc0b1dd19e5bce1ccc86115a132928716b9a5e..69f7c767f1669bba60bfa1cbc6813d85675aebb1 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -291,6 +291,7 @@ en:
   setting_repository_log_display_limit: Maximum number of revisions displayed on file log
   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
   
   permission_add_project: Create project
   permission_edit_project: Edit project

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 783d2b5c1713e9d45788f6002887b83b56e0f2da..58887ac6f99a3b1a60dcbcaa308379cdd6d5cf57 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -850,3 +850,4 @@ es:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 1f2f86c89339620c769e70464bb528a43cb06403..fdd97f0c8630e10adcd99e1c4d11cc4a687a8232 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -840,3 +840,4 @@ fi:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index ce9c2f776a9d3cc9991acc15e66fda12c07c187d..e36b4ed53ede50f7adcb27d00d9090ab937a5b09 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -323,6 +323,7 @@ fr:
   setting_repository_log_display_limit: "Nombre maximum de revisions affichées sur l'historique d'un fichier"
   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
   
   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 0f619adb68707b165d69f52c3a672a4ca505abc0..b6c97de9d5a7ca1d483e59ef289b4ea1a06552b0 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -829,3 +829,4 @@ gl:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/he.yml b/config/locales/he.yml
index d3b9bf0ec72fbeccf81e043651d383dac4e6d073..8984a27e3060c6e1d436b0dacd40f9a435e1510c 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -812,3 +812,4 @@ he:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1719562b079ec25a99b5eda2a1073963c256c425..25711bc74389984f56d6babe54edc45381653b74 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -835,3 +835,4 @@
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/it.yml b/config/locales/it.yml
index 721d72c4746e8481e3ba4431e9ea7f7ab7aac704..986d4b60c00cabf0e058635319622846fb973b60 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -815,3 +815,4 @@ it:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b00e9f2f72847259622b73fae58388a6b1201d1f..e9d2a708fc2e586f841d811ef27d01488cced9d5 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -828,3 +828,4 @@ ja:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b8cffa400a6247f948dcb7c0e6052522266c9737..833ddb53278e2b6062264f9466810f81eb537145 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -859,3 +859,4 @@ ko:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 3b2776d1bd8e57c5201871ec485c0aa19aafd181..acc1197d4cd1b582034b230dc92d9cdb1523b51a 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -840,3 +840,4 @@ lt:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 8c0a59ea59447e528e88b3b6a5d171777bcba8b9..7eed1a52a61d4cef9a618ef0c1f9b8d458c30a9d 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -785,3 +785,4 @@ nl:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/no.yml b/config/locales/no.yml
index a481d491216a91400b21b89a4aad3bf2aabbce5e..0d99ce442489c4e53e19d10ea74f75a04e437a02 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -802,3 +802,4 @@
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c575101ae87d407e2d95e86053566d14e420135d..1fed951ba5f1a7fa275c04788ea0c8034b4f97c1 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -833,3 +833,4 @@ pl:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 16b151bf7ae1a06299aa35459987291f4b97b763..05ccdc92f0321834677825ab926df71a10a081b7 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -835,3 +835,4 @@ pt-BR:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index ea40131c376c8bdb11e52d618f1d7004522b72fc..f8ef1c8a697a30c4e5ab6b2273b42d60d541ceeb 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -821,3 +821,4 @@ pt:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 7d61ffb109d359986b260c155d462b2ff827f36d..966f1d9531ec64c8d1ca99f68ad848b9d73f3b74 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -800,3 +800,4 @@ ro:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f2274db974efc14e866894d1c02a3e59f0c6b5ed..c66d47db02cf5a6478665730d07439ce26e7296f 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -927,3 +927,4 @@ ru:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 2647fbfd5bebb13c4307698a988aab6a744b9092..12aad3bf57f07691f3adee07298e8c0d8a42fcd7 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -802,3 +802,4 @@ sk:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   setting_repositories_encodings: Repositories encodings
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 676f744ff92859f2f49d2f953224cf9228f68887..76ee8ef7a4aa3a166d4416ed15c5422b971e0867 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -799,3 +799,4 @@ sl:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 8c6a753a037c5c33b19a6fad095776d3de75c046..9c984aed7e87a1480e340c07fc876624392c69a3 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -823,3 +823,4 @@
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 8912bb7cd97769f88c07d22f593f05f063ec268c..3cc2380dd34c0b137ff82a906d5b64632afd2f2f 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -857,3 +857,4 @@ sv:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2f5bc7404e0d20b00fead1bfff536474504b0982..12fdd9c9cc0238dac5d5d1b71296d2f846b5b9d4 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -800,3 +800,4 @@ th:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 4ab55429185200429eee926a9743517cae24305b..a75f7bc72b3c10830ffba57f93363dbdf1dbd0a4 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -836,3 +836,4 @@ tr:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 5a7da7e77f65ed070dcadb3b9de539ceccea988a..acf233edb020e42b7c615cf44bd3d9cfc7ba9826 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -799,3 +799,4 @@ uk:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index d6885501b29f1da26069917493ff32b7f55a3777..c628d60f6d27849f6efc7deb7bd0a5b910800310 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -869,3 +869,4 @@ vi:
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
   permission_add_project: Create project
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b13838478a54af01253e4146950b73a05ea92409..e48639f6fe32f70f2cc376487b4ede5735ae620f 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -907,3 +907,4 @@
   permission_add_project: Create project
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1c1f8a509efe37fa9e55b81ab848f6a599dffe97..5af59343cb0d3c96b89bb309cdc37ac6c134caba 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -832,3 +832,4 @@ zh:
   permission_add_project: Create project
   label_wiki_content_updated: Wiki page updated
   mail_body_wiki_content_updated: The '{{page}}' wiki page has been updated by {{author}}.
+  setting_new_project_user_role_id: Role given to a non-admin user who creates a project

diff --git a/config/settings.yml b/config/settings.yml
index 5d4d6ff14022a6890639541ee23fb2c0df15dd5c..e0950c51037f129dbf724718a3f57aeffa30d7bb 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -131,6 +131,10 @@ display_subprojects_issues:
   default: 1
 default_projects_public:
   default: 1
+# Role given to a non-admin user who creates a project
+new_project_user_role_id:
+  format: int
+  default: ''
 sequential_project_identifiers:
   default: 0
 # encodings used to convert repository files content to UTF-8