jro_apps/redmine Commit - r15548:8b86d5158e50

Moves blocks definition to Redmine::MyPage....

Jean-Philippe Lang -

r15548:8b86d5158e50

parent child

Context file:

r15548:8b86d5158e50

Collapse all files

app/controllers/my_controller.rb +9 -28

                helper :users
                helper :custom_fields
-               BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
-                          'issuesreportedbyme' => :label_reported_issues,
-                          'issueswatched' => :label_watched_issues,
-                          'news' => :label_news_latest,
-                          'calendar' => :label_calendar,
-                          'documents' => :label_document_plural,
-                          'timelog' => :label_spent_time
-                        }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
-               DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'],
-                                   'right' => ['issuesreportedbyme']
-                                }.freeze
                def index
                  page
                  render :action => 'page'
                # Show user's page
                def page
                  @user = User.current
-                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
+                 @blocks = @user.pref.my_page_layout
                end
                # Edit user's account
                # User's page layout configuration
                def page_layout
                  @user = User.current
-                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
-                 @block_options = []
-                 BLOCKS.each do |k, v|
-                   unless @blocks.values.flatten.include?(k)
-                     @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
-                   end
-                 end
+                 @blocks = @user.pref.my_page_layout
                end
                # Add a block to user's page
                # params[:block] : id of the block to add
                def add_block
                  block = params[:block].to_s.underscore
-                 if block.present? && BLOCKS.key?(block)
+                 if block.present? && Redmine::MyPage.blocks.key?(block)
                    @user = User.current
-                   layout = @user.pref[:my_page_layout] || {}
+                   layout = @user.pref.my_page_layout
                    # remove if already present in a group
                    %w(top left right).each {|f| (layout[f] ||= []).delete block }
                    # add it on top
                    layout['top'].unshift block
-                   @user.pref[:my_page_layout] = layout
+                   @user.pref.my_page_layout = layout
                    @user.pref.save
                  end
                  redirect_to my_page_layout_path
                  block = params[:block].to_s.underscore
                  @user = User.current
                  # remove block in all groups
-                 layout = @user.pref[:my_page_layout] || {}
+                 layout = @user.pref.my_page_layout
                  %w(top left right).each {|f| (layout[f] ||= []).delete block }
-                 @user.pref[:my_page_layout] = layout
+                 @user.pref.my_page_layout = layout
                  @user.pref.save
                  redirect_to my_page_layout_path
                end
                    group_items = (params["blocks"] || []).collect(&:underscore)
                    group_items.each {|s| s.sub!(/^block_/, '')}
                    if group_items and group_items.is_a? Array
-                     layout = @user.pref[:my_page_layout] || {}
+                     layout = @user.pref.my_page_layout
                      # remove group blocks if they are presents in other groups
                      %w(top left right).each {|f|
                        layout[f] = (layout[f] || []) - group_items
                      }
                      layout[group] = group_items
-                     @user.pref[:my_page_layout] = layout
+                     @user.pref.my_page_layout = layout
                      @user.pref.save
                    end
                  end

app/helpers/my_helper.rb +10 -1

                # Renders a single block content
                def render_block_content(block, user)
-                 unless MyController::BLOCKS.keys.include?(block)
+                 unless Redmine::MyPage.blocks.key?(block)
                    Rails.logger.warn("Unknown block \"#{block}\" found in #{user.login} (id=#{user.id}) preferences")
                    return
                  end
                  end
                end
+               def block_select_tag(user)
+                 disabled = user.pref.my_page_layout.values.flatten
+                 options = content_tag('option')
+                 Redmine::MyPage.block_options.each do |label, block|
+                   options << content_tag('option', label, :value => block, :disabled => disabled.include?(block))
+                 end
+                 content_tag('select', options, :id => "block-select")
+               end
                def calendar_items(startdt, enddt)
                  Issue.visible.
                    where(:project_id => User.current.projects.map(&:id)).

app/models/user_preference.rb +8 0

                def textarea_font; self[:textarea_font] end
                def textarea_font=(value); self[:textarea_font]=value; end
+               def my_page_layout
+                 self[:my_page_layout] ||= Redmine::MyPage.default_layout.deep_dup
+               end
+               def my_page_layout=(arg)
+                 self[:my_page_layout] = arg
+               end
              end

app/views/my/page_layout.html.erb +3 -6

              <div class="contextual">
-             <% if @block_options.present? %>
-               <%= form_tag({:action => "add_block"}, :id => "block-form") do %>
+             <%= form_tag({:action => "add_block"}, :id => "block-form") do %>
                <%= label_tag('block-select', l(:label_my_page_block)) %>:
-               <%= select_tag 'block',
-                              content_tag('option') + options_for_select(@block_options),
-                              :id => "block-select" %>
+               <%= block_select_tag(@user) %>
                <%= link_to l(:button_add), '#', :onclick => '$("#block-form").submit()', :class => 'icon icon-add' %>
-               <% end %>
              <% end %>
              <%= link_to l(:button_back), {:action => 'page'}, :class => 'icon icon-cancel' %>
              </div>

lib/redmine/my_page.rb ~~lib/redmine/views/my_page/block.rb~~ renamed +40 -10

		@@ -16,17 +16,47
16	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17	17
18	18	module Redmine
19		module ~~Views~~
20		module MyPage
21		module Block
22		def self.additional_blocks
23		@@additional_blocks \|\|= Dir.glob("#{Redmine::Plugin.directory}//app/views/my/blocks/_.{rhtml,erb}").inject({}) do \|h,file\|
24		name = File.basename(file).split('.').first.gsub(/^_/, '')
25		h[name] = name.to_sym
26		h
27		end
28		end
	19	module MyPage
	20	include Redmine::I18n
	21
	22	CORE_BLOCKS = {
	23	'issuesassignedtome' => :label_assigned_to_me_issues,
	24	'issuesreportedbyme' => :label_reported_issues,
	25	'issueswatched' => :label_watched_issues,
	26	'news' => :label_news_latest,
	27	'calendar' => :label_calendar,
	28	'documents' => :label_document_plural,
	29	'timelog' => :label_spent_time
	30	}
	31
	32	# Returns the available blocks
	33	def self.blocks
	34	CORE_BLOCKS.merge(additional_blocks).freeze
	35	end
	36
	37	def self.block_options
	38	options = []
	39	blocks.each do \|k, v\|
	40	options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
29	41	end
	42	options
	43	end
	44
	45	# Returns the additional blocks that are defined by plugin partials
	46	def self.additional_blocks
	47	@@additional_blocks \|\|= Dir.glob("#{Redmine::Plugin.directory}//app/views/my/blocks/_.{rhtml,erb}").inject({}) do \|h,file\|
	48	name = File.basename(file).split('.').first.gsub(/^_/, '')
	49	h[name] = name.to_sym
	50	h
	51	end
	52	end
	53
	54	# Returns the default layout for My Page
	55	def self.default_layout
	56	{
	57	'left' => ['issuesassignedtome'],
	58	'right' => ['issuesreportedbyme']
	59	}
30	60	end
31	61	end
32	62	end

test/functional/my_controller_test.rb +1 -1

                end
                def test_page_with_all_blocks
-                 blocks = MyController::BLOCKS.keys
+                 blocks = Redmine::MyPage.blocks.keys
                  preferences = User.find(2).pref
                  preferences[:my_page_layout] = {'top' => blocks}
                  preferences.save!

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages