diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-19 04:34:02 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-08-19 04:34:02 +0000 |
| commit | bc57078b128cf994495dfa35a5df0cbcc875ff19 (patch) | |
| tree | 866df078962a661fdf85cd389d2e296fd5457197 | |
| parent | 1c93f99a55299c2b0f6c61bd5a3c593328e33eb3 (diff) | |
| download | redmine-bc57078b128cf994495dfa35a5df0cbcc875ff19.tar.gz redmine-bc57078b128cf994495dfa35a5df0cbcc875ff19.zip | |
Merged r3944 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3994 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/calendars_controller.rb | 1 | ||||
| -rw-r--r-- | lib/redmine.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index f2af58086..1115691a1 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -1,4 +1,5 @@ class CalendarsController < ApplicationController + menu_item :calendar before_filter :find_optional_project rescue_from Query::StatementInvalid, :with => :query_statement_invalid diff --git a/lib/redmine.rb b/lib/redmine.rb index d390cda26..073e52d2d 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -184,6 +184,7 @@ Redmine::MenuManager.map :project_menu do |menu| 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 => 'index', :page => nil }, |