jro_apps/redmine Commit - r9216:a7bacf70fb18

Fixed: Unable to change locked, sticky flags and board when editing a message (#10564)....

Jean-Philippe Lang -

r9216:a7bacf70fb18

parent child

Context file:

r9216:a7bacf70fb18

Collapse all files

app/models/message.rb +1 -2

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 Message < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :board
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
               acts_as_attachable
               belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
               acts_as_searchable :columns => ['subject', 'content'],
                                  :include => {:board => :project},
                                  :project_key => "#{Board.table_name}.project_id",
                                  :date_column => "#{table_name}.created_on"
               acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                             :description => :content,
                             :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                             :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} :
                                                                                                                                                    {:id => o.parent_id, :r => o.id, :anchor => "message-#{o.id}"})}
               acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
                                         :author_key => :author_id
               acts_as_watchable
-              attr_protected :locked, :sticky
               validates_presence_of :board, :subject, :content
               validates_length_of :subject, :maximum => 255
               validate :cannot_reply_to_locked_topic, :on => :create
               after_create :add_author_as_watcher, :update_parent_last_reply
               after_update :update_messages_board
               after_destroy :reset_board_counters
               named_scope :visible, lambda {|*args| { :include => {:board => :project},
                                                       :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
               safe_attributes 'subject', 'content'
-              safe_attributes 'locked', 'sticky',
+              safe_attributes 'locked', 'sticky', 'board_id',
                 :if => lambda {|message, user|
                   user.allowed_to?(:edit_messages, message.project)
                 }
               def visible?(user=User.current)
                 !user.nil? && user.allowed_to?(:view_messages, project)
               end
               def cannot_reply_to_locked_topic
                 # Can not reply to a locked topic
                 errors.add :base, 'Topic is locked' if root.locked? && self != root
               end
               def update_parent_last_reply
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 end
                 board.reset_counters!
               end
               def update_messages_board
                 if board_id_changed?
                   Message.update_all("board_id = #{board_id}", ["id = ? OR parent_id = ?", root.id, root.id])
                   Board.reset_counters!(board_id_was)
                   Board.reset_counters!(board_id)
                 end
               end
               def reset_board_counters
                 board.reset_counters!
               end
               def sticky=(arg)
                 write_attribute :sticky, (arg == true || arg.to_s == '1' ? 1 : 0)
               end
               def sticky?
                 sticky == 1
               end
               def project
                 board.project
               end
               def editable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
               end
               def destroyable_by?(usr)
                 usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
               end
               private
               def add_author_as_watcher
                 Watcher.create(:watchable => self.root, :user => author)
               end
             end

test/functional/messages_controller_test.rb +24 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  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__)
             require 'messages_controller'
             # Re-raise errors caught by the controller.
             class MessagesController; def rescue_action(e) raise e end; end
             class MessagesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :boards, :messages, :enabled_modules
               def setup
                 @controller = MessagesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_show
                 get :show, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:board)
                 assert_not_nil assigns(:project)
                 assert_not_nil assigns(:topic)
               end
               def test_show_should_contain_reply_field_tags_for_quoting
                 @request.session[:user_id] = 2
                 get :show, :board_id => 1, :id => 1
                 assert_response :success
                 # tags required by MessagesController#quote
                 assert_tag 'input', :attributes => {:id => 'message_subject'}
                 assert_tag 'textarea', :attributes => {:id => 'message_content'}
                 assert_tag 'div', :attributes => {:id => 'reply'}
               end
               def test_show_with_pagination
                 message = Message.find(1)
                 assert_difference 'Message.count', 30 do
 .times do
                     message.children << Message.new(:subject => 'Reply', :content => 'Reply body', :author_id => 2, :board_id => 1)
                   end
                 end
                 get :show, :board_id => 1, :id => 1, :r => message.children.last(:order => 'id').id
                 assert_response :success
                 assert_template 'show'
                 replies = assigns(:replies)
                 assert_not_nil replies
                 assert !replies.include?(message.children.first(:order => 'id'))
                 assert replies.include?(message.children.last(:order => 'id'))
               end
               def test_show_with_reply_permission
                 @request.session[:user_id] = 2
                 get :show, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_tag :div, :attributes => { :id => 'reply' },
                                  :descendant => { :tag => 'textarea', :attributes => { :id => 'message_content' } }
               end
               def test_show_message_not_found
                 get :show, :board_id => 1, :id => 99999
                 assert_response 404
               end
               def test_get_new
                 @request.session[:user_id] = 2
                 get :new, :board_id => 1
                 assert_response :success
                 assert_template 'new'
               end
               def test_post_new
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
                 Setting.notified_events = ['message_posted']
                 post :new, :board_id => 1,
                            :message => { :subject => 'Test created message',
                                          :content => 'Message body'}
                 message = Message.find_by_subject('Test created message')
                 assert_not_nil message
                 assert_redirected_to "/boards/1/topics/#{message.to_param}"
                 assert_equal 'Message body', message.content
                 assert_equal 2, message.author_id
                 assert_equal 1, message.board_id
                 mail = ActionMailer::Base.deliveries.last
                 assert_not_nil mail
                 assert_equal "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] Test created message", mail.subject
                 assert_mail_body_match 'Message body', mail
                 # author
                 assert mail.bcc.include?('jsmith@somenet.foo')
                 # project member
                 assert mail.bcc.include?('dlopper@somenet.foo')
               end
               def test_get_edit
                 @request.session[:user_id] = 2
                 get :edit, :board_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
               end
               def test_post_edit
                 @request.session[:user_id] = 2
                 post :edit, :board_id => 1, :id => 1,
                             :message => { :subject => 'New subject',
                                           :content => 'New body'}
                 assert_redirected_to '/boards/1/topics/1'
                 message = Message.find(1)
                 assert_equal 'New subject', message.subject
                 assert_equal 'New body', message.content
               end
+              def test_post_edit_sticky_and_locked
+                @request.session[:user_id] = 2
+                post :edit, :board_id => 1, :id => 1,
+                            :message => { :subject => 'New subject',
+                                          :content => 'New body',
+                                          :locked => '1',
+                                          :sticky => '1'}
+                assert_redirected_to '/boards/1/topics/1'
+                message = Message.find(1)
+                assert_equal true, message.sticky?
+                assert_equal true, message.locked?
+              end
+              def test_post_edit_should_allow_to_change_board
+                @request.session[:user_id] = 2
+                post :edit, :board_id => 1, :id => 1,
+                            :message => { :subject => 'New subject',
+                                          :content => 'New body',
+                                          :board_id => 2}
+                assert_redirected_to '/boards/2/topics/1'
+                message = Message.find(1)
+                assert_equal Board.find(2), message.board
+              end
               def test_reply
                 @request.session[:user_id] = 2
                 post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
                 reply = Message.find(:first, :order => 'id DESC')
                 assert_redirected_to "/boards/1/topics/1?r=#{reply.id}"
                 assert Message.find_by_subject('Test reply')
               end
               def test_destroy_topic
                 @request.session[:user_id] = 2
                 assert_difference 'Message.count', -3 do
                   post :destroy, :board_id => 1, :id => 1
                 end
                 assert_redirected_to '/projects/ecookbook/boards/1'
                 assert_nil Message.find_by_id(1)
               end
               def test_destroy_reply
                 @request.session[:user_id] = 2
                 assert_difference 'Message.count', -1 do
                   post :destroy, :board_id => 1, :id => 2
                 end
                 assert_redirected_to '/boards/1/topics/1?r=2'
                 assert_nil Message.find_by_id(2)
               end
               def test_quote
                 @request.session[:user_id] = 2
                 xhr :get, :quote, :board_id => 1, :id => 3
                 assert_response :success
                 assert_select_rjs :show, 'reply'
               end
               def test_preview_new
                 @request.session[:user_id] = 2
                 post :preview,
                   :board_id => 1,
                   :message => {:subject => "", :content => "Previewed text"}
                 assert_response :success
                 assert_template 'common/_preview'
               end
               def test_preview_edit
                 @request.session[:user_id] = 2
                 post :preview,
                   :id => 4,
                   :board_id => 1,
                   :message => {:subject => "", :content => "Previewed text"}
                 assert_response :success
                 assert_template 'common/_preview'
               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