jro_apps/redmine Commit - r11002:98eb2edd2550

Merged r11225 from trunk (#12838)....

Jean-Philippe Lang -

r11002:98eb2edd2550

parent child

Context file:

r11002:98eb2edd2550

app/controllers/my_controller.rb +2 -1

               # params[:block] : id of the block to add
               def add_block
                 block = params[:block].to_s.underscore
-                (render :nothing => true; return) unless block && (BLOCKS.keys.include? block)
+                if block.present? && BLOCKS.key?(block)
                   @user = User.current
                   layout = @user.pref[:my_page_layout] || {}
                   # remove if already present in a group
                   layout['top'].unshift block
                   @user.pref[:my_page_layout] = layout
                   @user.pref.save
+                end
                 redirect_to :action => 'page_layout'
               end

test/functional/my_controller_test.rb +5 0

                 assert User.find(2).pref[:my_page_layout]['top'].include?('issuesreportedbyme')
               end
+              def test_add_invalid_block_should_redirect
+                post :add_block, :block => 'invalid'
+                assert_redirected_to '/my/page_layout'
+              end
               def test_remove_block
                 post :remove_block, :block => 'issuesassignedtome'
                 assert_redirected_to '/my/page_layout'

General Comments 0

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

No TODOs yet

	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