diff app/controllers/my_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children a1bdbf8a87d5
line wrap: on
line diff
--- a/app/controllers/my_controller.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/app/controllers/my_controller.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -139,7 +139,7 @@
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
     @block_options = []
     BLOCKS.each do |k, v|
-      unless %w(top left right).detect {|f| (@blocks[f] ||= []).include?(k)}
+      unless @blocks.values.flatten.include?(k)
         @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
       end
     end