Removed gantt and calendar menu items that do not fit into the core project menu...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4381 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index 4544b3399705da1e443d80b050773d057935ad29..3655ffefe47785bddcfe39da0b47b0e513936093 100644 (file)
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -1,5 +1,5 @@
 class CalendarsController < ApplicationController
-  menu_item :calendar
+  menu_item :issues
   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 50fd8c13dc603271568491a74113ae785be9bea4..d8105377093fd6e40ae07c29722efc342dce8e70 100644 (file)
--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -1,5 +1,5 @@
 class GanttsController < ApplicationController
-  menu_item :gantt
+  menu_item :issues
   before_filter :find_optional_project
 
   rescue_from Query::StatementInvalid, :with => :query_statement_invalid

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 1e6a71810347bfe01c8faedfd25201b272699f1b..c03260d7e71e4d429b34ac79d3511c54c2749aa7 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -191,8 +191,6 @@ 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 5fdf05540add36cf1f76dd57bfa5a843c67d782f..2d32abdcb53e4e5a6e46d9bf819aa12da1cafa93 100644 (file)
--- a/test/unit/lib/redmine_test.rb
+++ b/test/unit/lib/redmine_test.rb
@@ -62,14 +62,12 @@ class RedmineTest < ActiveSupport::TestCase
   end
 
   def test_project_menu
-    assert_number_of_items_in_menu :project_menu, 14
+    assert_number_of_items_in_menu :project_menu, 12
     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