Adds a setting for choosing the new object menu item style (#15880).

Set to use the new "+" drop-down by default, but let users revert to the "New issue" tab, or no menu item at all.

git-svn-id: http://svn.redmine.org/redmine/trunk@15508 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 67956667a07d59b9f533c352eb51e5c8913a0422..95c58674cee8caab53133f4f8e1ea9415a65baaf 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -362,7 +362,7 @@ class IssuesController < ApplicationController
   # Overrides Redmine::MenuManager::MenuController::ClassMethods for
   # when the "New issue" tab is enabled
   def current_menu_item
-    if Setting.new_project_issue_tab_enabled? && [:new, :create].include?(action_name.to_sym) 
+    if Setting.new_item_menu_tab == '1' && [:new, :create].include?(action_name.to_sym) 
       :new_issue
     else
       super

diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index 1185a7caefd25d782accd1259cb8cce3a04242d8..be3e70e346526d6d99958f15510a8a70f6ce1363 100644 (file)
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -25,7 +25,7 @@
 
 <p><%= setting_text_field :thumbnails_size, :size => 6 %></p>
 
-<p><%= setting_check_box :new_project_issue_tab_enabled %></p>
+<p><%= setting_select :new_item_menu_tab, [[l(:label_none), '0'], [l(:label_new_project_issue_tab_enabled), '1'], [l(:label_new_object_tab_enabled), '2']] %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index e1317219295ea2756334c097f4222e21b16ca496..a6b841ff381ebabe5cf172570dcc510565e5a6f4 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1201,7 +1201,7 @@ ar:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/az.yml b/config/locales/az.yml
index 7a5cdb9241698fe2e29a05e5d3cc543859873514..fa7a30b0e3274bfd8e0190c4c414783a3cbe0747 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1296,7 +1296,7 @@ az:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index b6412c92b9918e8c79d4dfa6c8dc79fb683b300f..672881f3a7691d3e5830f73e9a215f1e3a2ac20d 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -447,7 +447,6 @@ bg:
   setting_search_results_per_page: Резултати от търсене на страница
   setting_attachment_extensions_allowed: Позволени типове на файлове
   setting_attachment_extensions_denied: Разрешени типове на файлове
-  setting_new_project_issue_tab_enabled: Показване на меню-елемент "Нова задача"
 
   permission_add_project: Създаване на проект
   permission_add_subprojects: Създаване на подпроекти
@@ -1193,3 +1192,4 @@ bg:
   description_date_from: Въведете начална дата
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+  label_new_project_issue_tab_enabled: Показване на меню-елемент "Нова задача"

diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index aa47a22e9e7bd66bcf7bd5c4c5f19423f075e1ba..38995599dc207ad5a7cbde0b8e50ec5b2be747c1 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1214,7 +1214,7 @@ bs:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ec0b3ca5ae77ddf7c330802c52a0688a8ccc39c8..f165aed6eecbffdd5c8cd692fcc1fc49b9fa0057 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1194,7 +1194,7 @@ ca:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f0ef5a4762f231d3624723873f67ee377a1561af..610033882d38f25a1565e395318e63a4537f18d7 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1202,7 +1202,7 @@ cs:
   button_filter: Filtr
   mail_body_password_updated: Vaše heslo bylo změněno.
   label_no_preview: Náhled není k dispozici
-  setting_new_project_issue_tab_enabled: Zobraz záložku "Nový úkol"
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Zobraz záložku "Nový úkol"

diff --git a/config/locales/da.yml b/config/locales/da.yml
index 9b2020b33a1e3ef6b7233cc315e89dc2ebe6ce7d..188731a02626f8934481dbfb03696c123d05e261 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1218,7 +1218,7 @@ da:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/de.yml b/config/locales/de.yml
index bf6a11c48df0e1b918fd284c1a45aed50dcb5fe2..3aa5271a3cb2896ccef547ad4e42927c307ff1f2 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1204,7 +1204,7 @@ de:
   label_relations: Beziehungen
   button_filter: Filter
   mail_body_password_updated: Ihr Passwort wurde geändert.
-  setting_new_project_issue_tab_enabled: Tab "Neues Ticket" anzeigen
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Tab "Neues Ticket" anzeigen

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 66f96bfdc92a537fa4df9a032f3cc3ca2867ce3a..03563effbc2b29f189ad001db523fe3cb404f89b 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1201,7 +1201,7 @@ el:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index cf6f9770a81120c23857dd196fba1784d07d0625..e738493bbd2fd07ece7f261566cb68f7c027efb7 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1203,7 +1203,7 @@ en-GB:
   label_relations: Relations
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 522cb5227bfd19e80065bea0e2037b281720106c..908aa119a9f453844727ee6257c50e05fa15da3b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -444,7 +444,7 @@ en:
   setting_search_results_per_page: Search results per page
   setting_attachment_extensions_allowed: Allowed extensions
   setting_attachment_extensions_denied: Disallowed extensions
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
+  setting_new_item_menu_tab: Project menu tab for creating new objects
 
   permission_add_project: Create project
   permission_add_subprojects: Create subprojects
@@ -995,6 +995,8 @@ en:
   label_field_format_enumeration: Key/value list
   label_default_values_for_new_users: Default values for new users
   label_relations: Relations
+  label_new_project_issue_tab_enabled: Display the "New issue" tab
+  label_new_object_tab_enabled: Display the "+" drop-down
 
   button_login: Login
   button_submit: Submit

diff --git a/config/locales/es-PA.yml b/config/locales/es-PA.yml
index 0b76bdada82e721a260f848d3db80fab60fa39ba..54bde6b131ba38f7c747ba0d345ca7b4d9d64ec4 100644 (file)
--- a/config/locales/es-PA.yml
+++ b/config/locales/es-PA.yml
@@ -1235,7 +1235,7 @@ es-PA:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/es.yml b/config/locales/es.yml
index d9e781495dc20f3d100b5b37db4ac2ac936b52c1..345ac90a3a52970b5a43ca14a4cc5fc90cb014e8 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1233,7 +1233,7 @@ es:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/et.yml b/config/locales/et.yml
index f8ae0fbd9436009150dc0d4d4c913b1300ec30ba..fa3be6329ec8375b9cc71417914b7220fb18139c 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1205,7 +1205,7 @@ et:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 1dbfed25c7db2f49d45fdd1493e61681b5ead083..dc21ead28f68df5bc9f0f6645e80904c2da8c1e3 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1202,7 +1202,7 @@ eu:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index b9e7377e67d9dab4cc8a7fd24098a702734e5f99..6c7eb49a58a3a3947409b2784cb46fa0d8b293d7 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1202,7 +1202,7 @@ fa:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 14aa38cc85ff839a50eb13cd787e9bcb3873b599..49e510707e4a14dad2b8bcd5652e453d05da6c1c 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1222,7 +1222,7 @@ fi:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 760c84c95741f930a3439dcb25ed142a02d1f31a..49803506bd0534a18163ec0b46eb3f9f09e2590f 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -456,7 +456,7 @@ fr:
   setting_attachment_extensions_denied: Extensions non autorisées
   setting_sys_api_key: Clé de protection de l'API
   setting_lost_password: Autoriser la réinitialisation par email de mot de passe perdu
-  setting_new_project_issue_tab_enabled: Afficher l'onglet "Nouvelle demande"
+  setting_new_item_menu_tab: Onglet de création d'objets dans le menu du project
 
   permission_add_project: Créer un projet
   permission_add_subprojects: Créer des sous-projets
@@ -1004,6 +1004,8 @@ fr:
   label_field_format_enumeration: Liste clé/valeur
   label_default_values_for_new_users: Valeurs par défaut pour les nouveaux utilisateurs
   label_relations: Relations
+  label_new_project_issue_tab_enabled: Afficher l'onglet "Nouvelle demande"
+  label_new_object_tab_enabled: Afficher le menu déroulant "+"
 
   button_login: Connexion
   button_submit: Soumettre

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 437bf4b3f8c937e1424e67f30b9d2ce46b44de11..70afa9072f3bdc0b6b4b6aa6ba2d6606420eb6b0 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1209,7 +1209,7 @@ gl:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/he.yml b/config/locales/he.yml
index aad81c4a0cdffb7fff5eda688d26f0af69ecf0b2..a5b1b7d0bebeaf672ecaafe062e0bf1b94c10c0f 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1206,7 +1206,7 @@ he:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index a09064a5fbb6e56c90d88cb3dd3576456fc915c8..0a603db952dea937cede7be58630efb556cc2091 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1200,7 +1200,7 @@ hr:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 6f7f075a89338ba2483a64ec75f2b9aae4319787..e6b1f8595e521d79baaeb10106a9752dbcf364c1 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1220,7 +1220,7 @@
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/id.yml b/config/locales/id.yml
index dfa63dc8e11be82d3ca0556b32bd0841918d8a93..3e1aedcad468a718fae00f0422c51acd474e2aa5 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1205,7 +1205,7 @@ id:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/it.yml b/config/locales/it.yml
index b5310caadd4f43bb5b2f9a19ab30cabcbecbd6f8..08e5f14677d8e0b78d938c2d9620a4021d73f4f3 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1196,7 +1196,7 @@ it:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2c5a63514b5cc5b6e6949473051d30aae5ea7379..f7661003bfb2726f0ba8e9c6950bad1edd90219d 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1212,6 +1212,6 @@ ja:
   button_filter: フィルタ
   mail_body_password_updated: パスワードが変更されました。
   label_no_preview: このファイルはプレビューできません
-  setting_new_project_issue_tab_enabled: '"新しいチケット" タブを表示'
   error_no_tracker_allowed_for_new_issue_in_project: このプロジェクトにはチケットの追加が許可されているトラッカーがありません
   label_tracker_all: すべてのトラッカー
+  label_new_project_issue_tab_enabled: '"新しいチケット" タブを表示'

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 5f9fd63da8b5c7f55d25bc6e26c048961c04d6ac..4f7a6f22026becc1d5295a6d12b50b695d2a9325 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1240,7 +1240,7 @@ ko:
   button_filter: 필터
   mail_body_password_updated: 암호가 변경되었습니다.
   label_no_preview: 미리보기 없음
-  setting_new_project_issue_tab_enabled: '"새 일감" 탭 표시'
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: '"새 일감" 탭 표시'

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6aa63dcac583115369a2ac44f66d3128a7619af4..e1dbd6b8330114c146e26073e77faf1fd75e1134 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1190,7 +1190,7 @@ lt:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 2a7dc3c1d9fbe6a105e638f99bfa6bac0d4cef6e..39dbaac171f994aac8651457c20bcb2135f265e6 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1195,7 +1195,7 @@ lv:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 02757abe0c8ac2b9b4324ff443f584195881784a..ef587684f87fb8ef892e092df4585f066acc0f4f 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1201,7 +1201,7 @@ mk:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 6176c97e5eb75adae75251e61d6f5320bdb30a1e..0f2cec180f0c09a2868021a73e7f7f43288a1949 100644 (file)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1202,7 +1202,7 @@ mn:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e356bab91c31894cc5008cbbbda8c2244f1a05d0..421cf687211292fa3b2587cbd0afe91c0672cca7 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1180,7 +1180,7 @@ nl:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/no.yml b/config/locales/no.yml
index 083a956ac45ba77fb32d8c718a0b18546a6673dd..07657a820dd0ee3f038bcfc8c6474def46aa948f 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1191,7 +1191,7 @@
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a183a21307eacb4751f6c365fc1dd06c8ffc1f52..06691733fb5088b5982e88156cb8f65babbcdf42 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1216,7 +1216,7 @@ pl:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b8c360141528940048a12ad2721fc48e3b423f4a..bdd3f5a77e3f27ba4a35cab0ece2a39134bc34a0 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1219,7 +1219,7 @@ pt-BR:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 38b4b882ddb6e339fafdafcc79b161728067e632..1d6f7323d40a060112cef80519ed5b3afb174a97 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1203,7 +1203,7 @@ pt:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 34e5405e3a63775ee567728ade47ab71b0d37581..3e2f20b0c52e758e226f8605ece85fe81d193ae1 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1196,7 +1196,7 @@ ro:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index fdce0f2539d9d1bbcd66381ee0296d13ec6843a6..5261356e652511254df5b023c62e1b8d7916330d 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1302,7 +1302,7 @@ ru:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index b6c843947b2980ff6c167235a13af49c5855795f..9b3a4534b1b771ebddedb4325e1f9ae4ddbdf991 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1191,7 +1191,7 @@ sk:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 7d2d755fe2e110189a8a1425133dd87466eff6f1..1cb294cdf947faf0ac8eb5b622251c7fe90a4708 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1201,7 +1201,7 @@ sl:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 98d1f5e8a6f1613da3b31dddf73d0b57d523be46..cf6bda0ba66f619d6a8f03b0f69cf74f25e250c9 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1197,7 +1197,7 @@ sq:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index bf35302d2354c93bdfc5e762aade25b478e50640..c11de67ceab8eeb5cdc7af23394402b049848a71 100644 (file)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1203,7 +1203,7 @@ sr-YU:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 9d12a7d6025dac43d1a7c77bcd7b0bb3ad5d88ac..a68ae5d6a673b9ffe6f95b8abb1a9cefb8b48aa0 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1202,7 +1202,7 @@ sr:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4bdf72a51b3f4a05a70b15e76e9693b04fc4d43b..fd8c22f42582b9af7bcbf6217b6c7ce58a11c5ce 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1234,7 +1234,7 @@ sv:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/th.yml b/config/locales/th.yml
index bfdc38490f9b1dbf5a394d7c86a769846f30f825..e0fdd892b5d170b25d84a96d5fd3246f0bc15147 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1198,7 +1198,7 @@ th:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8eeb40698613e7e0ceedfce3ddbdd9e23afe1511..510c0dc78b7edcfd2ffd4b719cb15a404d10ee91 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1208,7 +1208,7 @@ tr:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index cb24471591ef8547439b0432c1618388f3595893..fe0746c98b889c7aa9953eee1e76c58d38c24341 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1196,7 +1196,7 @@ uk:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 04a4b45b7785f90a097303aa2c7635683a5a346f..a4e09b773efb09c6213cb7e96a547ca5a362ded0 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1254,7 +1254,7 @@ vi:
   button_filter: Filter
   mail_body_password_updated: Your password has been changed.
   label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: Display the "New issue" tab

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7ce98871c1e1863452703857d6529fa717be2311..a361f1256a607682661e987212b77619277c9af6 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -528,7 +528,6 @@
   setting_search_results_per_page: 每一頁的搜尋結果數目
   setting_attachment_extensions_allowed: 允許使用的附檔名
   setting_attachment_extensions_denied: 禁止使用的副檔名
-  setting_new_project_issue_tab_enabled: 顯示「建立新議題」標籤頁面
 
   permission_add_project: 建立專案
   permission_add_subprojects: 建立子專案
@@ -1275,3 +1274,4 @@
   description_date_from: 輸入起始日期
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
+  label_new_project_issue_tab_enabled: 顯示「建立新議題」標籤頁面

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d66b2954cf80e34cdc5479c36006ecfdf5b29b92..8fedfbb274833052adeded314c57dc71e0de82b4 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1194,7 +1194,7 @@ zh:
   button_filter: 设置为过滤条件
   mail_body_password_updated: 您的密码已经变更。
   label_no_preview: 没有可以显示的预览内容
-  setting_new_project_issue_tab_enabled: 显示“新建问题”标签
   error_no_tracker_allowed_for_new_issue_in_project: The project doesn't have any trackers
     for which you can create an issue
   label_tracker_all: All trackers
+  label_new_project_issue_tab_enabled: 显示“新建问题”标签

diff --git a/config/settings.yml b/config/settings.yml
index fd807c8a112b5f172879bfc4c383672dec54ae2d..807f9b7a7d96f35f7225b5539e7fd3533b8597eb 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -275,5 +275,5 @@ non_working_week_days:
   default:
   - '6'
   - '7'
-new_project_issue_tab_enabled:
-  default: 0
+new_item_menu_tab:
+  default: 2

diff --git a/lib/redmine.rb b/lib/redmine.rb
index fc166b6509964d053f21d8bf24b1602a91da0b0e..71722cc8e2bfe6e0af973d815e4b08781c86be5d 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -227,6 +227,7 @@ end
 
 Redmine::MenuManager.map :project_menu do |menu|
   menu.push :new_object, nil, :caption => ' + ',
+              :if => Proc.new { |p| Setting.new_item_menu_tab == '2' },
               :html => { :id => 'new-object', :onclick => 'toggleNewObjectDropdown(); return false;' }
   menu.push :new_issue_sub, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) },
@@ -251,7 +252,8 @@ Redmine::MenuManager.map :project_menu do |menu|
               :if => Proc.new { |p| p.shared_versions.any? }
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
   menu.push :new_issue, { :controller => 'issues', :action => 'new', :copy_from => nil }, :param => :project_id, :caption => :label_issue_new,
-              :if => Proc.new { |p| Setting.new_project_issue_tab_enabled? && Issue.allowed_target_trackers(p).any? },
+              :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) },
+              :if => Proc.new { |p| Setting.new_item_menu_tab == '1' && Issue.allowed_target_trackers(p).any? },
               :permission => :add_issues
   menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
   menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index dc50d13310dcc475a3cacfcbcf663df4d6182423..046efb85635c503441126dc3fbdb384c66985a51 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1104,7 +1104,7 @@ class IssuesControllerTest < ActionController::TestCase
   end
 
   def test_index_should_not_include_new_issue_tab_when_disabled
-    with_settings :new_project_issue_tab_enabled => '0' do
+    with_settings :new_item_menu_tab => '0' do
       @request.session[:user_id] = 2
       get :index, :project_id => 1
       assert_select '#main-menu a.new-issue', 0
@@ -1112,7 +1112,7 @@ class IssuesControllerTest < ActionController::TestCase
   end
 
   def test_index_should_include_new_issue_tab_when_enabled
-    with_settings :new_project_issue_tab_enabled => '1' do
+    with_settings :new_item_menu_tab => '1' do
       @request.session[:user_id] = 2
       get :index, :project_id => 1
       assert_select '#main-menu a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
@@ -1120,7 +1120,7 @@ class IssuesControllerTest < ActionController::TestCase
   end
 
   def test_new_should_have_new_issue_tab_as_current_menu_item
-    with_settings :new_project_issue_tab_enabled => '1' do
+    with_settings :new_item_menu_tab => '1' do
       @request.session[:user_id] = 2
       get :new, :project_id => 1
       assert_select '#main-menu a.new-issue.selected'
@@ -1128,7 +1128,7 @@ class IssuesControllerTest < ActionController::TestCase
   end
 
   def test_index_should_not_include_new_issue_tab_for_project_without_trackers
-    with_settings :new_project_issue_tab_enabled => '1' do
+    with_settings :new_item_menu_tab => '1' do
       Project.find(1).trackers.clear
   
       @request.session[:user_id] = 2
@@ -1138,7 +1138,7 @@ class IssuesControllerTest < ActionController::TestCase
   end
 
   def test_index_should_not_include_new_issue_tab_for_users_with_copy_issues_permission_only
-    with_settings :new_project_issue_tab_enabled => '1' do
+    with_settings :new_item_menu_tab => '1' do
       role = Role.find(1)
       role.remove_permission! :add_issues
       role.add_permission! :copy_issues