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
This commit is contained in:
parent
ae498a06e2
commit
3b01ea9fa4
|
@ -1,5 +1,5 @@
|
||||||
class CalendarsController < ApplicationController
|
class CalendarsController < ApplicationController
|
||||||
menu_item :calendar
|
menu_item :issues
|
||||||
before_filter :find_optional_project
|
before_filter :find_optional_project
|
||||||
|
|
||||||
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
|
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
class GanttsController < ApplicationController
|
class GanttsController < ApplicationController
|
||||||
menu_item :gantt
|
menu_item :issues
|
||||||
before_filter :find_optional_project
|
before_filter :find_optional_project
|
||||||
|
|
||||||
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
|
rescue_from Query::StatementInvalid, :with => :query_statement_invalid
|
||||||
|
|
|
@ -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 :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,
|
menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
|
||||||
:html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
|
: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 :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 :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
|
||||||
menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
|
menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
|
||||||
|
|
|
@ -62,14 +62,12 @@ class RedmineTest < ActiveSupport::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_project_menu
|
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, :overview
|
||||||
assert_menu_contains_item_named :project_menu, :activity
|
assert_menu_contains_item_named :project_menu, :activity
|
||||||
assert_menu_contains_item_named :project_menu, :roadmap
|
assert_menu_contains_item_named :project_menu, :roadmap
|
||||||
assert_menu_contains_item_named :project_menu, :issues
|
assert_menu_contains_item_named :project_menu, :issues
|
||||||
assert_menu_contains_item_named :project_menu, :new_issue
|
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, :news
|
||||||
assert_menu_contains_item_named :project_menu, :documents
|
assert_menu_contains_item_named :project_menu, :documents
|
||||||
assert_menu_contains_item_named :project_menu, :wiki
|
assert_menu_contains_item_named :project_menu, :wiki
|
||||||
|
|
Loading…
Reference in New Issue