kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserve uploaded files when creating a forum topic.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8940 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-23 13:02:35 +00:00
parent 4669c41e51
commit 435a634ac7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/messages_controller.rb
View File

@ -60,11 +60,13 @@ class MessagesController < ApplicationController
@message.locked = params[:message]['locked'] @message.locked = params[:message]['locked']
@message.sticky = params[:message]['sticky'] @message.sticky = params[:message]['sticky']
end end
if request.post? && @message.save if request.post?
call_hook(:controller_messages_new_after_save, { :params => params, :message => @message}) @message.save_attachments(params[:attachments])
attachments = Attachment.attach_files(@message, params[:attachments]) if @message.save
render_attachment_warning_if_needed(@message) call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
redirect_to :action => 'show', :id => @message render_attachment_warning_if_needed(@message)
redirect_to :action => 'show', :id => @message
end
end end
end end

2
app/views/messages/_form.html.erb
View File

@ -24,5 +24,5 @@
<!--[eoform:message]--> <!--[eoform:message]-->
<p><%= l(:label_attachment_plural) %><br /> <p><%= l(:label_attachment_plural) %><br />
<%= render :partial => 'attachments/form' %></p> <%= render :partial => 'attachments/form', :locals => {:container => @message} %></p>
</div> </div>