jro_apps/redmine Commit - r2687:7642b5a9ab18

Fixed: editing a message may cause sticky attribute to be NULL (#3356)....

Jean-Philippe Lang -

r2687:7642b5a9ab18

parent child

Context file:

r2687:7642b5a9ab18

Collapse all files

db/migrate/20090614091200_fix_messages_sticky_null.rb created 644 +9 0

@@ -0,0 +1,9
	1	class FixMessagesStickyNull < ActiveRecord::Migration
	2	def self.up
	3	Message.update_all('sticky = 0', 'sticky IS NULL')
	4	end
	5
	6	def self.down
	7	# nothing to do
	8	end
	9	end

app/models/message.rb +4 0

             # 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.
             class Message < ActiveRecord::Base
               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 => '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, :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
               after_create :add_author_as_watcher
               def validate_on_create
                 # Can not reply to a locked topic
                 errors.add_to_base 'Topic is locked' if root.locked? && self != root
               end
               def after_create
                 if parent
                   parent.reload.update_attribute(:last_reply_id, self.id)
                 end
                 board.reset_counters!
               end
               def after_update
                 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 after_destroy
                 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/unit/message_test.rb +15 0

             # 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.
             require File.dirname(__FILE__) + '/../test_helper'
             class MessageTest < Test::Unit::TestCase
               fixtures :projects, :roles, :members, :member_roles, :boards, :messages, :users, :watchers
               def setup
                 @board = Board.find(1)
                 @user = User.find(1)
               end
               def test_create
                 topics_count = @board.topics_count
                 messages_count = @board.messages_count
                 message = Message.new(:board => @board, :subject => 'Test message', :content => 'Test message content', :author => @user)
                 assert message.save
                 @board.reload
                 # topics count incremented
                 assert_equal topics_count+1, @board[:topics_count]
                 # messages count incremented
                 assert_equal messages_count+1, @board[:messages_count]
                 assert_equal message, @board.last_message
                 # author should be watching the message
                 assert message.watched_by?(@user)
               end
               def test_reply
                 topics_count = @board.topics_count
                 messages_count = @board.messages_count
                 @message = Message.find(1)
                 replies_count = @message.replies_count
                 reply_author = User.find(2)
                 reply = Message.new(:board => @board, :subject => 'Test reply', :content => 'Test reply content', :parent => @message, :author => reply_author)
                 assert reply.save
                 @board.reload
                 # same topics count
                 assert_equal topics_count, @board[:topics_count]
                 # messages count incremented
                 assert_equal messages_count+1, @board[:messages_count]
                 assert_equal reply, @board.last_message
                 @message.reload
                 # replies count incremented
                 assert_equal replies_count+1, @message[:replies_count]
                 assert_equal reply, @message.last_reply
                 # author should be watching the message
                 assert @message.watched_by?(reply_author)
               end
               def test_moving_message_should_update_counters
                 @message = Message.find(1)
                 assert_no_difference 'Message.count' do
                   # Previous board
                   assert_difference 'Board.find(1).topics_count', -1 do
                     assert_difference 'Board.find(1).messages_count', -(1 + @message.replies_count) do
                       # New board
                       assert_difference 'Board.find(2).topics_count' do
                         assert_difference 'Board.find(2).messages_count', (1 + @message.replies_count) do
                           @message.update_attributes(:board_id => 2)
                         end
                       end
                     end
                   end
                 end
               end
               def test_destroy_topic
                 message = Message.find(1)
                 board = message.board
                 topics_count, messages_count = board.topics_count, board.messages_count
                 assert_difference('Watcher.count', -1) do
                   assert message.destroy
                 end
                 board.reload
                 # Replies deleted
                 assert Message.find_all_by_parent_id(1).empty?
                 # Checks counters
                 assert_equal topics_count - 1, board.topics_count
                 assert_equal messages_count - 3, board.messages_count
                 # Watchers removed
               end
               def test_destroy_reply
                 message = Message.find(5)
                 board = message.board
                 topics_count, messages_count = board.topics_count, board.messages_count
                 assert message.destroy
                 board.reload
                 # Checks counters
                 assert_equal topics_count, board.topics_count
                 assert_equal messages_count - 1, board.messages_count
               end
               def test_editable_by
                 message = Message.find(6)
                 author = message.author
                 assert message.editable_by?(author)
                 author.roles_for_project(message.project).first.remove_permission!(:edit_own_messages)
                 assert !message.reload.editable_by?(author.reload)
               end
               def test_destroyable_by
                 message = Message.find(6)
                 author = message.author
                 assert message.destroyable_by?(author)
                 author.roles_for_project(message.project).first.remove_permission!(:delete_own_messages)
                 assert !message.reload.destroyable_by?(author.reload)
               end
+              def test_set_sticky
+                message = Message.new
+                assert_equal 0, message.sticky
+                message.sticky = nil
+                assert_equal 0, message.sticky
+                message.sticky = false
+                assert_equal 0, message.sticky
+                message.sticky = true
+                assert_equal 1, message.sticky
+                message.sticky = '0'
+                assert_equal 0, message.sticky
+                message.sticky = '1'
+                assert_equal 1, message.sticky
+              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