Fixed: editing a message may cause sticky attribute to be NULL (#3356).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2787 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
5e76040256
commit
7642b5a9ab
|
@ -66,6 +66,10 @@ class Message < ActiveRecord::Base
|
||||||
board.reset_counters!
|
board.reset_counters!
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def sticky=(arg)
|
||||||
|
write_attribute :sticky, (arg == true || arg.to_s == '1' ? 1 : 0)
|
||||||
|
end
|
||||||
|
|
||||||
def sticky?
|
def sticky?
|
||||||
sticky == 1
|
sticky == 1
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
class FixMessagesStickyNull < ActiveRecord::Migration
|
||||||
|
def self.up
|
||||||
|
Message.update_all('sticky = 0', 'sticky IS NULL')
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.down
|
||||||
|
# nothing to do
|
||||||
|
end
|
||||||
|
end
|
|
@ -128,4 +128,19 @@ class MessageTest < Test::Unit::TestCase
|
||||||
author.roles_for_project(message.project).first.remove_permission!(:delete_own_messages)
|
author.roles_for_project(message.project).first.remove_permission!(:delete_own_messages)
|
||||||
assert !message.reload.destroyable_by?(author.reload)
|
assert !message.reload.destroyable_by?(author.reload)
|
||||||
end
|
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
|
end
|
||||||
|
|
Loading…
Reference in New Issue