diff options
author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-21 16:07:28 +0000 |
---|---|---|
committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-21 16:07:28 +0000 |
commit | c259ada6e1c46b0c7c21bd11bc1a0659da1ede9e (patch) | |
tree | 25fc76b565d0b95375b245d7bc8e5897afc881e2 /lib/redmine.rb | |
parent | d3381fb518d79f815407ffc70d27cbda4208fc9e (diff) | |
download | redmine-c259ada6e1c46b0c7c21bd11bc1a0659da1ede9e.tar.gz redmine-c259ada6e1c46b0c7c21bd11bc1a0659da1ede9e.zip |
Refactor: rename WikiController#index to #show, it's a single resource action
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4266 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine.rb')
-rw-r--r-- | lib/redmine.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb index 7fe090826..d5825e00f 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -111,7 +111,7 @@ Redmine::AccessControl.map do |map| map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member - map.permission :view_wiki_pages, :wiki => [:index, :special, :page_index, :date_index] + map.permission :view_wiki_pages, :wiki => [:show, :special, :page_index, :date_index] map.permission :export_wiki_pages, :wiki => [:export] map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate] map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment] @@ -195,7 +195,7 @@ Redmine::MenuManager.map :project_menu do |menu| 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 }, :param => :project_id, + menu.push :wiki, { :controller => 'wiki', :action => 'show', :page => nil }, :param => :project_id, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural |