meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Display notice on forum updates (#2635).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17738 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2018-12-15 21:40:09 +00:00
parent 10eba2878a
commit 7d827b1389
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/messages_controller.rb
View File

@ -63,6 +63,7 @@ class MessagesController < ApplicationController
if @message.save if @message.save
call_hook(:controller_messages_new_after_save, { :params => params, :message => @message}) call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
render_attachment_warning_if_needed(@message) render_attachment_warning_if_needed(@message)
flash[:notice] = l(:notice_successful_create)
redirect_to board_message_path(@board, @message) redirect_to board_message_path(@board, @message)
end end
end end
@ -80,6 +81,7 @@ class MessagesController < ApplicationController
attachments = Attachment.attach_files(@reply, params[:attachments]) attachments = Attachment.attach_files(@reply, params[:attachments])
render_attachment_warning_if_needed(@reply) render_attachment_warning_if_needed(@reply)
end end
flash[:notice] = l(:notice_successful_update)
redirect_to board_message_path(@board, @topic, :r => @reply) redirect_to board_message_path(@board, @topic, :r => @reply)
end end
@ -101,6 +103,7 @@ class MessagesController < ApplicationController
(render_403; return false) unless @message.destroyable_by?(User.current) (render_403; return false) unless @message.destroyable_by?(User.current)
r = @message.to_param r = @message.to_param
@message.destroy @message.destroy
flash[:notice] = l(:notice_successful_delete)
if @message.parent if @message.parent
redirect_to board_message_path(@board, @message.parent, :r => r) redirect_to board_message_path(@board, @message.parent, :r => r)
else else

6
test/functional/messages_controller_test.rb
View File

@ -129,6 +129,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
} }
end end
assert_equal I18n.t(:notice_successful_create), flash[:notice]
message = Message.find_by_subject('Test created message') message = Message.find_by_subject('Test created message')
assert_not_nil message assert_not_nil message
assert_redirected_to "/boards/1/topics/#{message.to_param}" assert_redirected_to "/boards/1/topics/#{message.to_param}"
@ -171,6 +172,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
} }
assert_redirected_to '/boards/1/topics/1' assert_redirected_to '/boards/1/topics/1'
assert_equal I18n.t(:notice_successful_update), flash[:notice]
message = Message.find(1) message = Message.find(1)
assert_equal 'New subject', message.subject assert_equal 'New subject', message.subject
assert_equal 'New body', message.content assert_equal 'New body', message.content
@ -189,6 +191,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
} }
assert_redirected_to '/boards/1/topics/1' assert_redirected_to '/boards/1/topics/1'
assert_equal I18n.t(:notice_successful_update), flash[:notice]
message = Message.find(1) message = Message.find(1)
assert_equal true, message.sticky? assert_equal true, message.sticky?
assert_equal true, message.locked? assert_equal true, message.locked?
@ -222,6 +225,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
reply = Message.order('id DESC').first reply = Message.order('id DESC').first
assert_redirected_to "/boards/1/topics/1?r=#{reply.id}" assert_redirected_to "/boards/1/topics/1?r=#{reply.id}"
assert_equal I18n.t(:notice_successful_update), flash[:notice]
assert Message.find_by_subject('Test reply') assert Message.find_by_subject('Test reply')
end end
@ -234,6 +238,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
end end
assert_redirected_to '/projects/ecookbook/boards/1' assert_redirected_to '/projects/ecookbook/boards/1'
assert_equal I18n.t(:notice_successful_delete), flash[:notice]
assert_nil Message.find_by_id(1) assert_nil Message.find_by_id(1)
end end
@ -246,6 +251,7 @@ class MessagesControllerTest < Redmine::ControllerTest
} }
end end
assert_redirected_to '/boards/1/topics/1?r=2' assert_redirected_to '/boards/1/topics/1?r=2'
assert_equal I18n.t(:notice_successful_delete), flash[:notice]
assert_nil Message.find_by_id(2) assert_nil Message.find_by_id(2)
end end