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

Preserve uploaded files when on news. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8942 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-23 13:07:27 +00:00
parent 4f217618af
commit 707ce0beef
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/news_controller.rb
View File

@ -69,6 +69,7 @@ class NewsController < ApplicationController
def create def create
@news = News.new(:project => @project, :author => User.current) @news = News.new(:project => @project, :author => User.current)
@news.attributes = params[:news] @news.attributes = params[:news]
@news.save_attachments(params[:attachments])
if @news.save if @news.save
attachments = Attachment.attach_files(@news, params[:attachments]) attachments = Attachment.attach_files(@news, params[:attachments])
render_attachment_warning_if_needed(@news) render_attachment_warning_if_needed(@news)
@ -83,6 +84,7 @@ class NewsController < ApplicationController
end end
def update def update
@news.save_attachments(params[:attachments])
if @news.update_attributes(params[:news]) if @news.update_attributes(params[:news])
attachments = Attachment.attach_files(@news, params[:attachments]) attachments = Attachment.attach_files(@news, params[:attachments])
render_attachment_warning_if_needed(@news) render_attachment_warning_if_needed(@news)

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

@ -3,7 +3,7 @@
<p><%= f.text_field :title, :required => true, :size => 60 %></p> <p><%= f.text_field :title, :required => true, :size => 60 %></p>
<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p> <p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p> <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p> <p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
</div> </div>
<%= wikitoolbar_for 'news_description' %> <%= wikitoolbar_for 'news_description' %>