jro_apps/redmine Commit - r10995:6e6ce7c08595

Fixed that adding a blank/invalid block to my page renders a blank page (#12838)....

Jean-Philippe Lang -

r10995:6e6ce7c08595

parent child

Context file:

r10995:6e6ce7c08595

Collapse all files

app/controllers/my_controller.rb +10 -9

             # Redmine - project management software
             # Copyright (C) 2006-2013  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MyController < ApplicationController
               before_filter :require_login
               helper :issues
               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'
               end
               # Show user's page
               def page
                 @user = User.current
                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
               end
               # Edit user's account
               def account
                 @user = User.current
                 @pref = @user.pref
                 if request.post?
                   @user.safe_attributes = params[:user]
                   @user.pref.attributes = params[:pref]
                   @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
                   if @user.save
                     @user.pref.save
                     @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
                     set_language_if_valid @user.language
                     flash[:notice] = l(:notice_account_updated)
                     redirect_to my_account_path
                     return
                   end
                 end
               end
               # Destroys user's account
               def destroy
                 @user = User.current
                 unless @user.own_account_deletable?
                   redirect_to my_account_path
                   return
                 end
                 if request.post? && params[:confirm]
                   @user.destroy
                   if @user.destroyed?
                     logout_user
                     flash[:notice] = l(:notice_account_deleted)
                   end
                   redirect_to home_path
                 end
               end
               # Manage user's password
               def password
                 @user = User.current
                 unless @user.change_password_allowed?
                   flash[:error] = l(:notice_can_t_change_password)
                   redirect_to my_account_path
                   return
                 end
                 if request.post?
                   if @user.check_password?(params[:password])
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to my_account_path
                     end
                   else
                     flash[:error] = l(:notice_account_wrong_password)
                   end
                 end
               end
               # Create a new feeds key
               def reset_rss_key
                 if request.post?
                   if User.current.rss_token
                     User.current.rss_token.destroy
                     User.current.reload
                   end
                   User.current.rss_key
                   flash[:notice] = l(:notice_feeds_access_key_reseted)
                 end
                 redirect_to my_account_path
               end
               # Create a new API key
               def reset_api_key
                 if request.post?
                   if User.current.api_token
                     User.current.api_token.destroy
                     User.current.reload
                   end
                   User.current.api_key
                   flash[:notice] = l(:notice_api_access_key_reseted)
                 end
                 redirect_to my_account_path
               end
               # 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 %w(top left right).detect {|f| (@blocks[f] ||= []).include?(k)}
                     @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]
                   end
                 end
               end
               # Add a block to user's page
               # The block is added on top of the page
               # 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
+                  @user = User.current
-                layout = @user.pref[:my_page_layout] || {}
+                  layout = @user.pref[:my_page_layout] || {}
-                # remove if already present in a group
+                  # remove if already present in a group
-                %w(top left right).each {|f| (layout[f] ||= []).delete block }
+                  %w(top left right).each {|f| (layout[f] ||= []).delete block }
-                # add it on top
+                  # add it on top
-                layout['top'].unshift block
+                  layout['top'].unshift block
-                @user.pref[:my_page_layout] = layout
+                  @user.pref[:my_page_layout] = layout
-                @user.pref.save
+                  @user.pref.save
+                end
                 redirect_to my_page_layout_path
               end
               # Remove a block to user's page
               # params[:block] : id of the block to remove
               def remove_block
                 block = params[:block].to_s.underscore
                 @user = User.current
                 # remove block in all groups
                 layout = @user.pref[:my_page_layout] || {}
                 %w(top left right).each {|f| (layout[f] ||= []).delete block }
                 @user.pref[:my_page_layout] = layout
                 @user.pref.save
                 redirect_to my_page_layout_path
               end
               # Change blocks order on user's page
               # params[:group] : group to order (top, left or right)
               # params[:list-(top|left|right)] : array of block ids of the group
               def order_blocks
                 group = params[:group]
                 @user = User.current
                 if group.is_a?(String)
                   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] || {}
                     # 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.save
                   end
                 end
                 render :nothing => true
               end
             end

test/functional/my_controller_test.rb +5 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class MyControllerTest < ActionController::TestCase
               fixtures :users, :user_preferences, :roles, :projects, :members, :member_roles,
               :issues, :issue_statuses, :trackers, :enumerations, :custom_fields, :auth_sources
               def setup
                 @request.session[:user_id] = 2
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'page'
               end
               def test_page
                 get :page
                 assert_response :success
                 assert_template 'page'
               end
               def test_page_with_timelog_block
                 preferences = User.find(2).pref
                 preferences[:my_page_layout] = {'top' => ['timelog']}
                 preferences.save!
                 TimeEntry.create!(:user => User.find(2), :spent_on => Date.yesterday, :issue_id => 1, :hours => 2.5, :activity_id => 10)
                 get :page
                 assert_response :success
                 assert_select 'tr.time-entry' do
                   assert_select 'td.subject a[href=/issues/1]'
                   assert_select 'td.hours', :text => '2.50'
                 end
               end
               def test_page_with_all_blocks
                 blocks = MyController::BLOCKS.keys
                 preferences = User.find(2).pref
                 preferences[:my_page_layout] = {'top' => blocks}
                 preferences.save!
                 get :page
                 assert_response :success
                 assert_select 'div.mypage-box', blocks.size
               end
               def test_my_account_should_show_editable_custom_fields
                 get :account
                 assert_response :success
                 assert_template 'account'
                 assert_equal User.find(2), assigns(:user)
                 assert_tag :input, :attributes => { :name => 'user[custom_field_values][4]'}
               end
               def test_my_account_should_not_show_non_editable_custom_fields
                 UserCustomField.find(4).update_attribute :editable, false
                 get :account
                 assert_response :success
                 assert_template 'account'
                 assert_equal User.find(2), assigns(:user)
                 assert_no_tag :input, :attributes => { :name => 'user[custom_field_values][4]'}
               end
               def test_update_account
                 post :account,
                   :user => {
                     :firstname => "Joe",
                     :login => "root",
                     :admin => 1,
                     :group_ids => ['10'],
                     :custom_field_values => {"4" => "0100562500"}
                   }
                 assert_redirected_to '/my/account'
                 user = User.find(2)
                 assert_equal user, assigns(:user)
                 assert_equal "Joe", user.firstname
                 assert_equal "jsmith", user.login
                 assert_equal "0100562500", user.custom_value_for(4).value
                 # ignored
                 assert !user.admin?
                 assert user.groups.empty?
               end
               def test_my_account_should_show_destroy_link
                 get :account
                 assert_select 'a[href=/my/account/destroy]'
               end
               def test_get_destroy_should_display_the_destroy_confirmation
                 get :destroy
                 assert_response :success
                 assert_template 'destroy'
                 assert_select 'form[action=/my/account/destroy]' do
                   assert_select 'input[name=confirm]'
                 end
               end
               def test_post_destroy_without_confirmation_should_not_destroy_account
                 assert_no_difference 'User.count' do
                   post :destroy
                 end
                 assert_response :success
                 assert_template 'destroy'
               end
               def test_post_destroy_without_confirmation_should_destroy_account
                 assert_difference 'User.count', -1 do
                   post :destroy, :confirm => '1'
                 end
                 assert_redirected_to '/'
                 assert_match /deleted/i, flash[:notice]
               end
               def test_post_destroy_with_unsubscribe_not_allowed_should_not_destroy_account
                 User.any_instance.stubs(:own_account_deletable?).returns(false)
                 assert_no_difference 'User.count' do
                   post :destroy, :confirm => '1'
                 end
                 assert_redirected_to '/my/account'
               end
               def test_change_password
                 get :password
                 assert_response :success
                 assert_template 'password'
                 # non matching password confirmation
                 post :password, :password => 'jsmith',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret1234'
                 assert_response :success
                 assert_template 'password'
                 assert_error_tag :content => /Password doesn&#x27;t match confirmation/
                 # wrong password
                 post :password, :password => 'wrongpassword',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret123'
                 assert_response :success
                 assert_template 'password'
                 assert_equal 'Wrong password', flash[:error]
                 # good password
                 post :password, :password => 'jsmith',
                                 :new_password => 'secret123',
                                 :new_password_confirmation => 'secret123'
                 assert_redirected_to '/my/account'
                 assert User.try_to_login('jsmith', 'secret123')
               end
               def test_change_password_should_redirect_if_user_cannot_change_its_password
                 User.find(2).update_attribute(:auth_source_id, 1)
                 get :password
                 assert_not_nil flash[:error]
                 assert_redirected_to '/my/account'
               end
               def test_page_layout
                 get :page_layout
                 assert_response :success
                 assert_template 'page_layout'
               end
               def test_add_block
                 post :add_block, :block => 'issuesreportedbyme'
                 assert_redirected_to '/my/page_layout'
                 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'
                 assert !User.find(2).pref[:my_page_layout].values.flatten.include?('issuesassignedtome')
               end
               def test_order_blocks
                 xhr :post, :order_blocks, :group => 'left', 'blocks' => ['documents', 'calendar', 'latestnews']
                 assert_response :success
                 assert_equal ['documents', 'calendar', 'latestnews'], User.find(2).pref[:my_page_layout]['left']
               end
               def test_reset_rss_key_with_existing_key
                 @previous_token_value = User.find(2).rss_key # Will generate one if it's missing
                 post :reset_rss_key
                 assert_not_equal @previous_token_value, User.find(2).rss_key
                 assert User.find(2).rss_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_reset_rss_key_without_existing_key
                 assert_nil User.find(2).rss_token
                 post :reset_rss_key
                 assert User.find(2).rss_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_reset_api_key_with_existing_key
                 @previous_token_value = User.find(2).api_key # Will generate one if it's missing
                 post :reset_api_key
                 assert_not_equal @previous_token_value, User.find(2).api_key
                 assert User.find(2).api_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
               def test_reset_api_key_without_existing_key
                 assert_nil User.find(2).api_token
                 post :reset_api_key
                 assert User.find(2).api_token
                 assert_match /reset/, flash[:notice]
                 assert_redirected_to '/my/account'
               end
             end

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