jro_apps/redmine Commit - r3080:9d120c872c1b

Fixes block reordering on my page (#2971)....

Jean-Philippe Lang -

r3080:9d120c872c1b

parent child

Context file:

r3080:9d120c872c1b

Collapse all files

app/controllers/my_controller.rb +16 -17

             # 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
             # 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 :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
               verify :xhr => true,
-                     :session => :page_layout,
                      :only => [:add_block, :remove_block, :order_blocks]
               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.attributes = params[:user]
                   @user.mail_notification = (params[:notification_option] == 'all')
                   @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 = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
                     set_language_if_valid @user.language
                     flash[:notice] = l(:notice_account_updated)
                     redirect_to :action => 'account'
                     return
                   end
                 end
                 @notification_options = [[l(:label_user_mail_option_all), 'all'],
                                          [l(:label_user_mail_option_none), 'none']]
                 # Only users that belong to more than 1 project can select projects for which they are notified
                 # Note that @user.membership.size would fail since AR ignores :include association option when doing a count
                 @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
                 @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')
               end
               # Manage user's password
               def password
                 @user = User.current
                 if @user.auth_source_id
                   flash[:error] = l(:notice_can_t_change_password)
                   redirect_to :action => 'account'
                   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 :action => 'account'
                     end
                   else
                     flash[:error] = l(:notice_account_wrong_password)
                   end
                 end
               end
               # Create a new feeds key
               def reset_rss_key
                 if request.post? && User.current.rss_token
                   User.current.rss_token.destroy
                   flash[:notice] = l(:notice_feeds_access_key_reseted)
                 end
                 redirect_to :action => 'account'
               end
               # User's page layout configuration
               def page_layout
                 @user = User.current
                 @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
-                session[:page_layout] = @blocks
-                %w(top left right).each {|f| session[:page_layout][f] ||= [] }
                 @block_options = []
                 BLOCKS.each {|k, v| @block_options << [l("my.blocks.#{v}", :default => [v, v.to_s.humanize]), k.dasherize]}
               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)
                 @user = User.current
+                layout = @user.pref[:my_page_layout] || {}
                 # remove if already present in a group
-                %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
+                %w(top left right).each {|f| (layout[f] ||= []).delete block }
                 # add it on top
-                session[:page_layout]['top'].unshift block
+                layout['top'].unshift block
+                @user.pref[:my_page_layout] = layout
+                @user.pref.save
                 render :partial => "block", :locals => {:user => @user, :block_name => block}
               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
-                %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
+                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
                 render :nothing => true
               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["list-#{group}"] || []).collect(&:underscore)
                   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|
-                      session[:page_layout][f] = (session[:page_layout][f] || []) - group_items
+                      layout[f] = (layout[f] || []) - group_items
                     }
-                    session[:page_layout][group] = group_items
+                    layout[group] = group_items
+                    @user.pref[:my_page_layout] = layout
+                    @user.pref.save
                   end
                 end
                 render :nothing => true
               end
-              # Save user's page layout
-              def page_layout_save
-                @user = User.current
-                @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
-                @user.pref.save
-                session[:page_layout] = nil
-                redirect_to :action => 'page'
-              end
             end

app/views/my/page_layout.rhtml +1 -2

             <script language="JavaScript">
             //<![CDATA[
             function recreateSortables() {
                 Sortable.destroy('list-top');
                 Sortable.destroy('list-left');
                 Sortable.destroy('list-right');
             	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
             	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
             	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
             }
             function updateSelect() {
                 s = $('block-select')
                 for (var i = 0; i < s.options.length; i++) {
                     if ($('block_' + s.options[i].value)) {
                         s.options[i].disabled = true;
                     } else {
                         s.options[i].disabled = false;
                     }
                 }
                 s.options[0].selected = true;
             }
             function afterAddBlock() {
                 recreateSortables();
                 updateSelect();
             }
             function removeBlock(block) {
                 Effect.DropOut(block);
                 updateSelect();
             }
             //]]>
             </script>
             <div class="contextual">
             <% form_tag({:action => "add_block"}, :id => "block-form") do %>
             <%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
             <%= link_to_remote l(:button_add),
                        {:url => { :action => "add_block" },
                         :with => "Form.serialize('block-form')",
                         :update => "list-top",
                         :position => :top,
                         :complete => "afterAddBlock();"
                        }, :class => 'icon icon-add'
                          %>
             <% end %>
-            <%= link_to l(:button_save), {:action => 'page_layout_save'}, :class => 'icon icon-save' %>
+            <%= link_to l(:button_back), {:action => 'page'}, :class => 'icon icon-cancel' %>
-            <%= link_to l(:button_cancel), {:action => 'page'}, :class => 'icon icon-cancel' %>
             </div>
             <h2><%=l(:label_my_page)%></h2>
             <div id="list-top" class="block-receiver">
             	<% @blocks['top'].each do |b|
             	   next unless MyController::BLOCKS.keys.include? b %>
             	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
             	<% end if @blocks['top'] %>
             </div>
             <div id="list-left" class="splitcontentleft block-receiver">
             	<% @blocks['left'].each do |b|
             	   next unless MyController::BLOCKS.keys.include? b %>
             	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
             	<% end if @blocks['left'] %>
             </div>
             <div id="list-right" class="splitcontentright block-receiver">
             	<% @blocks['right'].each do |b|
             	   next unless MyController::BLOCKS.keys.include? b %>
             	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
             	<% end if @blocks['right'] %>
             </div>
             <%= sortable_element 'list-top',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "top" }
                    %>
             <%= sortable_element 'list-left',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "left" }
                    %>
             <%= sortable_element 'list-right',
                   :tag => 'div',
                   :only => 'mypage-box',
                   :handle => "handle",
                   :dropOnEmpty => true,
                   :containment => ['list-top', 'list-left', 'list-right'],
                   :constraint => false,
                   :url => { :action => "order_blocks", :group => "right" }
                    %>
             <%= javascript_tag "updateSelect()" %>

test/fixtures/user_preferences.yml +12 -5

             ---
             user_preferences_001:
               others: |
                 ---
                 :my_page_layout:
                   left:
-                  - latest_news
+                  - latestnews
                   - documents
                   right:
-                  - issues_assigned_to_me
+                  - issuesassignedtome
-                  - issues_reported_by_me
                   top:
                   - calendar
               id: 1
               user_id: 1
               hide_mail: true
             user_preferences_002:
-              others: |+
+              others: |
-                --- {}
+                ---
+                :my_page_layout:
+                  left:
+                  - latestnews
+                  - documents
+                  right:
+                  - issuesassignedtome
+                  top:
+                  - calendar
               id: 2
               user_id: 3
               hide_mail: false

test/functional/my_controller_test.rb +25 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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.dirname(__FILE__) + '/../test_helper'
             require 'my_controller'
             # Re-raise errors caught by the controller.
             class MyController; def rescue_action(e) raise e end; end
             class MyControllerTest < ActionController::TestCase
-              fixtures :users, :issues, :issue_statuses, :trackers, :enumerations, :custom_fields
+              fixtures :users, :user_preferences, :roles, :projects, :issues, :issue_statuses, :trackers, :enumerations, :custom_fields
               def setup
                 @controller = MyController.new
                 @request    = ActionController::TestRequest.new
                 @request.session[:user_id] = 2
                 @response   = ActionController::TestResponse.new
               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_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,
                                          :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
                 assert !user.admin?
               end
               def test_change_password
                 get :password
                 assert_response :success
                 assert_template 'password'
                 # non matching password confirmation
                 post :password, :password => 'jsmith',
                                 :new_password => 'hello',
                                 :new_password_confirmation => 'hello2'
                 assert_response :success
                 assert_template 'password'
                 assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
                 # wrong password
                 post :password, :password => 'wrongpassword',
                                 :new_password => 'hello',
                                 :new_password_confirmation => 'hello'
                 assert_response :success
                 assert_template 'password'
                 assert_equal 'Wrong password', flash[:error]
                 # good password
                 post :password, :password => 'jsmith',
                                 :new_password => 'hello',
                                 :new_password_confirmation => 'hello'
                 assert_redirected_to 'my/account'
                 assert User.try_to_login('jsmith', 'hello')
               end
+              def test_page_layout
+                get :page_layout
+                assert_response :success
+                assert_template 'page_layout'
+              end
+              def test_add_block
+                xhr :post, :add_block, :block => 'issuesreportedbyme'
+                assert_response :success
+                assert User.find(2).pref[:my_page_layout]['top'].include?('issuesreportedbyme')
+              end
+              def test_remove_block
+                xhr :post, :remove_block, :block => 'issuesassignedtome'
+                assert_response :success
+                assert !User.find(2).pref[:my_page_layout].values.flatten.include?('issuesassignedtome')
+              end
+              def test_order_blocks
+                xhr :post, :order_blocks, :group => 'left', 'list-left' => ['documents', 'calendar', 'latestnews']
+                assert_response :success
+                assert_equal ['documents', 'calendar', 'latestnews'], User.find(2).pref[:my_page_layout]['left']
+              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