diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-07 12:53:45 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-07 12:53:45 +0000 |
| commit | 3b01ea9fa42cec01a17664a64de6f8157d363bec (patch) | |
| tree | d6b69ef47333b22dbf782abfbcbaa00273ddae12 | |
| parent | ae498a06e25668a2561d0374ba7a6ecd96b67b89 (diff) | |
| download | redmine-3b01ea9fa42cec01a17664a64de6f8157d363bec.tar.gz redmine-3b01ea9fa42cec01a17664a64de6f8157d363bec.zip | |
Removed gantt and calendar menu items that do not fit into the core project menu (#6271).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4381 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/calendars_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/gantts_controller.rb | 2 | ||||
| -rw-r--r-- | lib/redmine.rb | 2 | ||||
| -rw-r--r-- | test/unit/lib/redmine_test.rb | 4 |
4 files changed, 3 insertions, 7 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 4544b3399..3655ffefe 100644 --- 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 50fd8c13d..d81053770 100644 --- 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 1e6a71810..c03260d7e 100644 --- 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 5fdf05540..2d32abdcb 100644 --- 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 |