diff options
| author | Go MAEDA <maeda@farend.jp> | 2021-03-06 06:46:59 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2021-03-06 06:46:59 +0000 |
| commit | e0581b34b7d8ccdde3f65ef347d8edb1eb7fdc14 (patch) | |
| tree | fe48bad2915e6264eb9bafa9840b4e3c3da5ae97 | |
| parent | ce5c54a590330f89a726586d836c4fdf98f01034 (diff) | |
| download | redmine-e0581b34b7d8ccdde3f65ef347d8edb1eb7fdc14.tar.gz redmine-e0581b34b7d8ccdde3f65ef347d8edb1eb7fdc14.zip | |
Activity tab in cross-project menu is sometimes broken (#34805).
Patch by Felix Schäfer.
git-svn-id: http://svn.redmine.org/redmine/trunk@20764 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine.rb | 2 | ||||
| -rw-r--r-- | test/integration/lib/redmine/menu_manager_test.rb | 6 |
2 files changed, 7 insertions, 1 deletions
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" |