mirror of
				https://github.com/redmine/redmine.git
				synced 2025-11-03 20:06:24 +01:00 
			
		
		
		
	Activity tab in cross-project menu is sometimes broken (#34032).
Patch by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/trunk@20762 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
		@@ -225,7 +225,7 @@ Redmine::MenuManager.map :application_menu do |menu|
 | 
				
			|||||||
  menu.push :projects, {:controller => 'projects', :action => 'index'},
 | 
					  menu.push :projects, {:controller => 'projects', :action => 'index'},
 | 
				
			||||||
            :permission => nil,
 | 
					            :permission => nil,
 | 
				
			||||||
            :caption => :label_project_plural
 | 
					            :caption => :label_project_plural
 | 
				
			||||||
  menu.push :activity, {:controller => 'activities', :action => 'index'}
 | 
					  menu.push :activity, {:controller => 'activities', :action => 'index', :id => nil}
 | 
				
			||||||
  menu.push(
 | 
					  menu.push(
 | 
				
			||||||
    :issues,
 | 
					    :issues,
 | 
				
			||||||
    {:controller => 'issues', :action => 'index'},
 | 
					    {:controller => 'issues', :action => 'index'},
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -126,6 +126,12 @@ class MenuManagerTest < Redmine::IntegrationTest
 | 
				
			|||||||
    end
 | 
					    end
 | 
				
			||||||
  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
 | 
					  def test_project_menu_should_show_roadmap_if_subprojects_have_versions
 | 
				
			||||||
    Version.delete_all
 | 
					    Version.delete_all
 | 
				
			||||||
    # Create a version in the project "eCookbook Subproject 1"
 | 
					    # Create a version in the project "eCookbook Subproject 1"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user