diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-26 16:36:56 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-26 16:36:56 +0000 |
commit | d40bf201310e5f2bbb0c7a2a3e33b4957708c495 (patch) | |
tree | 6f45891876a6e454153c3b2fb6c8ba8a5cedfa8c /app/controllers/my_controller.rb | |
parent | 5b96d1b083a82d3ae68072c77af9521e720a3af8 (diff) | |
download | redmine-d40bf201310e5f2bbb0c7a2a3e33b4957708c495.tar.gz redmine-d40bf201310e5f2bbb0c7a2a3e33b4957708c495.zip |
Allow My Page blocks to be added to from a plugin (#2840).
Partials must be placed under the app/views/my/blocks directory of the plugin.
An example can be found in the sample plugin.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2529 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/my_controller.rb')
-rw-r--r-- | app/controllers/my_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index ae063d60a..b39dc1c9c 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2009 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -28,7 +28,7 @@ class MyController < ApplicationController 'calendar' => :label_calendar, 'documents' => :label_document_plural, 'timelog' => :label_spent_time - }.freeze + }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze DEFAULT_LAYOUT = { 'left' => ['issuesassignedtome'], 'right' => ['issuesreportedbyme'] @@ -108,7 +108,7 @@ class MyController < ApplicationController session[:page_layout] = @blocks %w(top left right).each {|f| session[:page_layout][f] ||= [] } @block_options = [] - BLOCKS.each {|k, v| @block_options << [l(v), k.dasherize]} + BLOCKS.each {|k, v| @block_options << [l_or_humanize(v), k.dasherize]} end # Add a block to user's page |