jro_apps/redmine Commit - r8820:435a634ac718

Preserve uploaded files when creating a forum topic....

Jean-Philippe Lang -

r8820:435a634ac718

parent child

Context file:

r8820:435a634ac718

app/controllers/messages_controller.rb +7 -5

                    @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

app/views/messages/_form.html.erb +1 -1

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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages