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

                  end
                end
+               # 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)
+                   :new_issue
+                 else
+                   super
+                 end
+               end
                private
                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

                def test_index_should_include_new_issue_link
                  @request.session[:user_id] = 2
                  get :index, :project_id => 1
-                 assert_select 'a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
+                 assert_select '#content a.new-issue[href="/projects/ecookbook/issues/new"]', :text => 'New issue'
                end
                def test_index_should_not_include_new_issue_link_for_project_without_trackers
                  @request.session[:user_id] = 2
                  get :index, :project_id => 1
-                 assert_select 'a.new-issue', 0
+                 assert_select '#content a.new-issue', 0
                end
                def test_index_should_not_include_new_issue_link_for_users_with_copy_issues_permission_only
                  @request.session[:user_id] = 2
                  get :index, :project_id => 1
-                 assert_select 'a.new-issue', 0
+                 assert_select '#content a.new-issue', 0
                end
                def test_index_without_project_should_include_new_issue_link
                  @request.session[:user_id] = 2
                  get :index
-                 assert_select 'a.new-issue[href="/issues/new"]', :text => 'New issue'
+                 assert_select '#content a.new-issue[href="/issues/new"]', :text => 'New issue'
+               end
+               def test_index_should_not_include_new_issue_tab_when_disabled
+                 with_settings :new_project_issue_tab_enabled => '0' do
+                   @request.session[:user_id] = 2
+                   get :index, :project_id => 1
+                   assert_select '#main-menu a.new-issue', 0
+                 end
+               end
+               def test_index_should_include_new_issue_tab_when_enabled
+                 with_settings :new_project_issue_tab_enabled => '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'
+                 end
+               end
+               def test_new_should_have_new_issue_tab_as_current_menu_item
+                 with_settings :new_project_issue_tab_enabled => '1' do
+                   @request.session[:user_id] = 2
+                   get :new, :project_id => 1
+                   assert_select '#main-menu a.new-issue.selected'
+                 end
+               end
+               def test_index_should_not_include_new_issue_tab_for_project_without_trackers
+                 with_settings :new_project_issue_tab_enabled => '1' do
+                   Project.find(1).trackers.clear
+                   @request.session[:user_id] = 2
+                   get :index, :project_id => 1
+                   assert_select '#main-menu a.new-issue', 0
+                 end
+               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
+                   role = Role.find(1)
+                   role.remove_permission! :add_issues
+                   role.add_permission! :copy_issues
+                   @request.session[:user_id] = 2
+                   get :index, :project_id => 1
+                   assert_select '#main-menu a.new-issue', 0
+                 end
                end
                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