Merged r9350 and r9351 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9353 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-04-06 12:23:53 +00:00
parent bec5e4443d
commit cda408dd81
3 changed files with 31 additions and 4 deletions

View File

@ -37,7 +37,6 @@ class Message < ActiveRecord::Base
:author_key => :author_id :author_key => :author_id
acts_as_watchable acts_as_watchable
attr_protected :locked, :sticky
validates_presence_of :board, :subject, :content validates_presence_of :board, :subject, :content
validates_length_of :subject, :maximum => 255 validates_length_of :subject, :maximum => 255
validate :cannot_reply_to_locked_topic, :on => :create validate :cannot_reply_to_locked_topic, :on => :create
@ -50,7 +49,7 @@ class Message < ActiveRecord::Base
:conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } } :conditions => Project.allowed_to_condition(args.shift || User.current, :view_messages, *args) } }
safe_attributes 'subject', 'content' safe_attributes 'subject', 'content'
safe_attributes 'locked', 'sticky', safe_attributes 'locked', 'sticky', 'board_id',
:if => lambda {|message, user| :if => lambda {|message, user|
user.allowed_to?(:edit_messages, message.project) user.allowed_to?(:edit_messages, message.project)
} }

View File

@ -6,13 +6,17 @@
<p><label for="message_subject"><%= l(:field_subject) %></label><br /> <p><label for="message_subject"><%= l(:field_subject) %></label><br />
<%= f.text_field :subject, :size => 120, :id => "message_subject" %> <%= f.text_field :subject, :size => 120, :id => "message_subject" %>
<% if !replying && User.current.allowed_to?(:edit_messages, @project) %> <% unless replying %>
<% if @message.safe_attribute? 'sticky' %>
<label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label> <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
<% end %>
<% if @message.safe_attribute? 'locked' %>
<label><%= f.check_box :locked %><%= l(:label_board_locked) %></label> <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
<% end %>
<% end %> <% end %>
</p> </p>
<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %> <% if !replying && !@message.new_record? && @message.safe_attribute?('board_id') %>
<p><label><%= l(:label_board) %></label><br /> <p><label><%= l(:label_board) %></label><br />
<%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p> <%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p>
<% end %> <% end %>

View File

@ -131,6 +131,30 @@ class MessagesControllerTest < ActionController::TestCase
assert_equal 'New body', message.content assert_equal 'New body', message.content
end 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 def test_reply
@request.session[:user_id] = 2 @request.session[:user_id] = 2
post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' } post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }