jro_apps/redmine Commit - r15025:4019ba76ab30

Restores the "New issue" tab in the project menu and makes it optional (#6204)....

Jean-Philippe Lang -

r15025:4019ba76ab30

parent child

Context file:

r15025:4019ba76ab30

Collapse all files

app/controllers/issues_controller.rb +10 0

@@ -350,6 +350,16 class IssuesController < ApplicationController
350	end	350	end
351	end	351	end
352		352
		353	# Overrides Redmine::MenuManager::MenuController::ClassMethods for
		354	# when the "New issue" tab is enabled
		355	def current_menu_item
		356	if Setting.new_project_issue_tab_enabled? && [:new, :create].include?(action_name.to_sym)
		357	:new_issue
		358	else
		359	super
		360	end
		361	end
		362
353	private	363	private
354		364
355	def retrieve_previous_and_next_issue_ids	365	def retrieve_previous_and_next_issue_ids

app/views/settings/_display.html.erb +2 0

             <p><%= setting_check_box :thumbnails_enabled %></p>
             <p><%= setting_text_field :thumbnails_size, :size => 6 %></p>
+            <p><%= setting_check_box :new_project_issue_tab_enabled %></p>
             </div>
             <%= submit_tag l(:button_save) %>

config/locales/en.yml +1 0

               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
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects

config/locales/fr.yml +1 0

               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"
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets

config/settings.yml +2 0

               default:
               - '6'
               - '7'
+            new_project_issue_tab_enabled:
+              default: 0

lib/redmine.rb +4 0

               menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                           :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,
+                          :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) },
+                          :if => Proc.new { |p| Setting.new_project_issue_tab_enabled? && p.trackers.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
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural

test/functional/issues_controller_test.rb +50 -4

@@ -1060,7 +1060,7 class IssuesControllerTest < ActionController::TestCase
1060	def test_index_should_include_new_issue_link	1060	def test_index_should_include_new_issue_link
1061	@request.session[:user_id] = 2	1061	@request.session[:user_id] = 2
1062	get :index, :project_id => 1	1062	get :index, :project_id => 1
1063	assert_select 'a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'	1063	assert_select '#content a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
1064	end	1064	end
1065		1065
1066	def test_index_should_not_include_new_issue_link_for_project_without_trackers	1066	def test_index_should_not_include_new_issue_link_for_project_without_trackers
@@ -1068,7 +1068,7 class IssuesControllerTest < ActionController::TestCase
1068		1068
1069	@request.session[:user_id] = 2	1069	@request.session[:user_id] = 2
1070	get :index, :project_id => 1	1070	get :index, :project_id => 1
1071	assert_select 'a.new-issue', 0	1071	assert_select '#content a.new-issue', 0
1072	end	1072	end
1073		1073
1074	def test_index_should_not_include_new_issue_link_for_users_with_copy_issues_permission_only	1074	def test_index_should_not_include_new_issue_link_for_users_with_copy_issues_permission_only
@@ -1078,13 +1078,59 class IssuesControllerTest < ActionController::TestCase
1078		1078
1079	@request.session[:user_id] = 2	1079	@request.session[:user_id] = 2
1080	get :index, :project_id => 1	1080	get :index, :project_id => 1
1081	assert_select 'a.new-issue', 0	1081	assert_select '#content a.new-issue', 0
1082	end	1082	end
1083		1083
1084	def test_index_without_project_should_include_new_issue_link	1084	def test_index_without_project_should_include_new_issue_link
1085	@request.session[:user_id] = 2	1085	@request.session[:user_id] = 2
1086	get :index	1086	get :index
1087	assert_select 'a.new-issue[href="/issues/new"]', :text => 'New issue'	1087	assert_select '#content a.new-issue[href="/issues/new"]', :text => 'New issue'
		1088	end
		1089
		1090	def test_index_should_not_include_new_issue_tab_when_disabled
		1091	with_settings :new_project_issue_tab_enabled => '0' do
		1092	@request.session[:user_id] = 2
		1093	get :index, :project_id => 1
		1094	assert_select '#main-menu a.new-issue', 0
		1095	end
		1096	end
		1097
		1098	def test_index_should_include_new_issue_tab_when_enabled
		1099	with_settings :new_project_issue_tab_enabled => '1' do
		1100	@request.session[:user_id] = 2
		1101	get :index, :project_id => 1
		1102	assert_select '#main-menu a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
		1103	end
		1104	end
		1105
		1106	def test_new_should_have_new_issue_tab_as_current_menu_item
		1107	with_settings :new_project_issue_tab_enabled => '1' do
		1108	@request.session[:user_id] = 2
		1109	get :new, :project_id => 1
		1110	assert_select '#main-menu a.new-issue.selected'
		1111	end
		1112	end
		1113
		1114	def test_index_should_not_include_new_issue_tab_for_project_without_trackers
		1115	with_settings :new_project_issue_tab_enabled => '1' do
		1116	Project.find(1).trackers.clear
		1117
		1118	@request.session[:user_id] = 2
		1119	get :index, :project_id => 1
		1120	assert_select '#main-menu a.new-issue', 0
		1121	end
		1122	end
		1123
		1124	def test_index_should_not_include_new_issue_tab_for_users_with_copy_issues_permission_only
		1125	with_settings :new_project_issue_tab_enabled => '1' do
		1126	role = Role.find(1)
		1127	role.remove_permission! :add_issues
		1128	role.add_permission! :copy_issues
		1129
		1130	@request.session[:user_id] = 2
		1131	get :index, :project_id => 1
		1132	assert_select '#main-menu a.new-issue', 0
		1133	end
1088	end	1134	end
1089		1135
1090	def test_show_by_anonymous	1136	def test_show_by_anonymous

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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