|
|
|
@ -70,7 +70,7 @@ class MessagesController < ApplicationController
|
|
|
|
|
if @message.save
|
|
|
|
|
call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
|
|
|
|
|
render_attachment_warning_if_needed(@message)
|
|
|
|
|
redirect_to board_message_path(@board, @message)
|
|
|
|
|
redirect_to board_message_url(@board, @message)
|
|
|
|
|
else
|
|
|
|
|
layout_file = @project ? 'base_projects' : 'base_courses'
|
|
|
|
|
render :action => 'new', :layout => layout_file
|
|
|
|
@ -81,7 +81,7 @@ class MessagesController < ApplicationController
|
|
|
|
|
# Reply to a topic
|
|
|
|
|
def reply
|
|
|
|
|
if params[:reply][:content] == ""
|
|
|
|
|
(redirect_to board_message_path(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
|
|
|
|
|
(redirect_to board_message_url(@board, @topic, :r => @reply), :notice => l(:label_reply_empty);return)
|
|
|
|
|
end
|
|
|
|
|
@quote = params[:quote][:quote]
|
|
|
|
|
@reply = Message.new
|
|
|
|
@ -98,7 +98,7 @@ class MessagesController < ApplicationController
|
|
|
|
|
else
|
|
|
|
|
#render file: 'messages#show', layout: 'base_courses'
|
|
|
|
|
end
|
|
|
|
|
redirect_to board_message_path(@board, @topic, :r => @reply)
|
|
|
|
|
redirect_to board_message_url(@board, @topic, :r => @reply)
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
@ -116,7 +116,7 @@ class MessagesController < ApplicationController
|
|
|
|
|
render_attachment_warning_if_needed(@message)
|
|
|
|
|
flash[:notice] = l(:notice_successful_update)
|
|
|
|
|
@message.reload
|
|
|
|
|
redirect_to board_message_path(@message.board, @message.root, :r => (@message.parent_id && @message.id))
|
|
|
|
|
redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
|
|
|
|
|
elsif request.get?
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.html {
|
|
|
|
@ -139,15 +139,15 @@ class MessagesController < ApplicationController
|
|
|
|
|
# modify by nwb
|
|
|
|
|
if @project
|
|
|
|
|
if @message.parent
|
|
|
|
|
redirect_to board_message_path(@board, @message.parent, :r => r)
|
|
|
|
|
redirect_to board_message_url(@board, @message.parent, :r => r)
|
|
|
|
|
else
|
|
|
|
|
redirect_to project_board_path(@project, @board)
|
|
|
|
|
redirect_to board_message_url(@project, @board)
|
|
|
|
|
end
|
|
|
|
|
elsif @course
|
|
|
|
|
if @message.parent
|
|
|
|
|
redirect_to board_message_path(@board, @message.parent, :r => r)
|
|
|
|
|
redirect_to board_message_url(@board, @message.parent, :r => r)
|
|
|
|
|
else
|
|
|
|
|
redirect_to course_board_path(@course, @board)
|
|
|
|
|
redirect_to course_board_url(@course, @board)
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|