jro_apps/redmine Commit - r15550:55be5e82b849

Adds #add_block and #remove_block methods....

Jean-Philippe Lang -

r15550:55be5e82b849

parent child

Context file:

r15550:55be5e82b849

Collapse all files

app/controllers/my_controller.rb +5 -23

             # Redmine - project management software
             # Copyright (C) 2006-2016  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_action :require_login
               # let user change user's password when user has to
               skip_before_action :check_password_change, :only => :password
               require_sudo_mode :account, only: :post
               require_sudo_mode :reset_rss_key, :reset_api_key, :show_api_key, :destroy
               helper :issues
               helper :users
               helper :custom_fields
               def index
                 page
                 render :action => 'page'
               end
               # Show user's page
               def page
                 @user = User.current
                 @blocks = @user.pref.my_page_layout
               end
               # Edit user's account
               def account
                 @user = User.current
                 @pref = @user.pref
                 if request.post?
                   @user.safe_attributes = params[:user]
                   @user.pref.safe_attributes = params[:pref]
                   if @user.save
                     @user.pref.save
                     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])
                     flash.now[:error] = l(:notice_account_wrong_password)
                   elsif params[:password] == params[:new_password]
                     flash.now[:error] = l(:notice_new_password_must_be_different)
                   else
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     @user.must_change_passwd = false
                     if @user.save
                       # The session token was destroyed by the password change, generate a new one
                       session[:tk] = @user.generate_session_token
                       Mailer.password_updated(@user)
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to my_account_path
                     end
                   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
               def show_api_key
                 @user = User.current
               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
               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
-                if block.present? && Redmine::MyPage.blocks.key?(block)
                 @user = User.current
-                  layout = @user.pref.my_page_layout
+                @user.pref.add_block params[:block]
-                  # 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.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
+                @user.pref.remove_block params[: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
                 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
+              # params[:blocks] : 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|
+                  group_items.each {|s| @user.pref.remove_block(s)}
-                      layout[f] = (layout[f] || []) - group_items
+                  @user.pref.my_page_layout[group] = group_items
-                    layout[group] = group_items
-                    @user.pref.my_page_layout = layout
                   @user.pref.save
                 end
-                end
                 head 200
               end
             end

app/models/user_preference.rb +18 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 UserPreference < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :user
               serialize :others
               attr_protected :others, :user_id
               before_save :set_others_hash
               safe_attributes 'hide_mail',
                 'time_zone',
                 'comments_sorting',
                 'warn_on_leaving_unsaved',
                 'no_self_notified',
                 'textarea_font'
               TEXTAREA_FONT_OPTIONS = ['monospace', 'proportional']
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && !(attributes && attributes.key?(:hide_mail))
                   self.hide_mail = Setting.default_users_hide_mail?
                 end
                 if new_record? && !(attributes && attributes.key?(:no_self_notified))
                   self.no_self_notified = true
                 end
                 self.others ||= {}
               end
               def set_others_hash
                 self.others ||= {}
               end
               def [](attr_name)
                 if has_attribute? attr_name
                   super
                 else
                   others ? others[attr_name] : nil
                 end
               end
               def []=(attr_name, value)
                 if has_attribute? attr_name
                   super
                 else
                   h = (read_attribute(:others) || {}).dup
                   h.update(attr_name => value)
                   write_attribute(:others, h)
                   value
                 end
               end
               def comments_sorting; self[:comments_sorting] end
               def comments_sorting=(order); self[:comments_sorting]=order end
               def warn_on_leaving_unsaved; self[:warn_on_leaving_unsaved] || '1'; end
               def warn_on_leaving_unsaved=(value); self[:warn_on_leaving_unsaved]=value; end
               def no_self_notified; (self[:no_self_notified] == true || self[:no_self_notified] == '1'); end
               def no_self_notified=(value); self[:no_self_notified]=value; end
               def activity_scope; Array(self[:activity_scope]) ; end
               def activity_scope=(value); self[:activity_scope]=value ; end
               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
+              def remove_block(block)
+                block = block.to_s.underscore
+                %w(top left right).each do |f|
+                  (my_page_layout[f] ||= []).delete(block)
+                end
+                my_page_layout
+              end
+              def add_block(block)
+                block = block.to_s.underscore
+                return unless Redmine::MyPage.blocks.key?(block)
+                remove_block(block)
+                # add it on top
+                my_page_layout['top'] ||= []
+                my_page_layout['top'].unshift(block)
+              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