Preserve uploaded files when creating a forum topic.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8940 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4669c41e51
commit
435a634ac7
|
@ -60,11 +60,13 @@ class MessagesController < ApplicationController
|
|||
@message.locked = params[:message]['locked']
|
||||
@message.sticky = params[:message]['sticky']
|
||||
end
|
||||
if request.post? && @message.save
|
||||
call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
|
||||
attachments = Attachment.attach_files(@message, params[:attachments])
|
||||
render_attachment_warning_if_needed(@message)
|
||||
redirect_to :action => 'show', :id => @message
|
||||
if request.post?
|
||||
@message.save_attachments(params[:attachments])
|
||||
if @message.save
|
||||
call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
|
||||
render_attachment_warning_if_needed(@message)
|
||||
redirect_to :action => 'show', :id => @message
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -24,5 +24,5 @@
|
|||
<!--[eoform:message]-->
|
||||
|
||||
<p><%= l(:label_attachment_plural) %><br />
|
||||
<%= render :partial => 'attachments/form' %></p>
|
||||
<%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue