From 8fcef23fef33031cc721f9c0052710e11f316a03 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 6 Mar 2021 06:43:34 +0000 Subject: [PATCH] Activity tab in cross-project menu is sometimes broken (#34032). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/trunk@20762 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine.rb | 2 +- test/integration/lib/redmine/menu_manager_test.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/redmine.rb b/lib/redmine.rb index 2d4dd0f7d..142b60888 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -225,7 +225,7 @@ Redmine::MenuManager.map :application_menu do |menu| menu.push :projects, {:controller => 'projects', :action => 'index'}, :permission => nil, :caption => :label_project_plural - menu.push :activity, {:controller => 'activities', :action => 'index'} + menu.push :activity, {:controller => 'activities', :action => 'index', :id => nil} menu.push( :issues, {:controller => 'issues', :action => 'index'}, diff --git a/test/integration/lib/redmine/menu_manager_test.rb b/test/integration/lib/redmine/menu_manager_test.rb index 07fbcc332..318bc6129 100644 --- a/test/integration/lib/redmine/menu_manager_test.rb +++ b/test/integration/lib/redmine/menu_manager_test.rb @@ -126,6 +126,12 @@ class MenuManagerTest < Redmine::IntegrationTest end end + def test_cross_project_menu_should_link_to_global_activity + log_user('dlopper', 'foo') + get '/queries/3/edit' + assert_select 'a.activity[href=?]', '/activity' + end + def test_project_menu_should_show_roadmap_if_subprojects_have_versions Version.delete_all # Create a version in the project "eCookbook Subproject 1" -- 2.39.5