From: Jean-Philippe Lang Date: Sun, 7 Nov 2010 22:38:10 +0000 (+0000) Subject: Reverted r4381. X-Git-Tag: 1.1.0~187 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=44c9ad687fa608e7a4eaac1ef571598e1130feac;p=redmine.git Reverted r4381. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4388 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 3655ffefe..4544b3399 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -1,5 +1,5 @@ class CalendarsController < ApplicationController - menu_item :issues + menu_item :calendar before_filter :find_optional_project rescue_from Query::StatementInvalid, :with => :query_statement_invalid diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb index d81053770..50fd8c13d 100644 --- a/app/controllers/gantts_controller.rb +++ b/app/controllers/gantts_controller.rb @@ -1,5 +1,5 @@ class GanttsController < ApplicationController - menu_item :issues + menu_item :gantt before_filter :find_optional_project rescue_from Query::StatementInvalid, :with => :query_statement_invalid diff --git a/lib/redmine.rb b/lib/redmine.rb index c03260d7e..1e6a71810 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -191,6 +191,8 @@ Redmine::MenuManager.map :project_menu do |menu| menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new, :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) } + 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 menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id, diff --git a/test/unit/lib/redmine_test.rb b/test/unit/lib/redmine_test.rb index 2d32abdcb..5fdf05540 100644 --- a/test/unit/lib/redmine_test.rb +++ b/test/unit/lib/redmine_test.rb @@ -62,12 +62,14 @@ class RedmineTest < ActiveSupport::TestCase end def test_project_menu - assert_number_of_items_in_menu :project_menu, 12 + assert_number_of_items_in_menu :project_menu, 14 assert_menu_contains_item_named :project_menu, :overview assert_menu_contains_item_named :project_menu, :activity assert_menu_contains_item_named :project_menu, :roadmap assert_menu_contains_item_named :project_menu, :issues assert_menu_contains_item_named :project_menu, :new_issue + assert_menu_contains_item_named :project_menu, :calendar + assert_menu_contains_item_named :project_menu, :gantt assert_menu_contains_item_named :project_menu, :news assert_menu_contains_item_named :project_menu, :documents assert_menu_contains_item_named :project_menu, :wiki