diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/news_controller.rb | 5 | ||||
| -rw-r--r-- | app/models/news.rb | 1 | ||||
| -rw-r--r-- | app/views/news/_form.html.erb | 3 | ||||
| -rw-r--r-- | app/views/news/edit.html.erb | 2 | ||||
| -rw-r--r-- | app/views/news/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/news/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/news/show.html.erb | 5 |
7 files changed, 14 insertions, 6 deletions
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 0d091396a..34d4a13cc 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -27,6 +27,7 @@ class NewsController < ApplicationController accept_api_auth :index helper :watchers + helper :attachments def index case params[:format] @@ -70,6 +71,8 @@ class NewsController < ApplicationController if request.post? @news.attributes = params[:news] if @news.save + attachments = Attachment.attach_files(@news, params[:attachments]) + render_attachment_warning_if_needed(@news) flash[:notice] = l(:notice_successful_create) redirect_to :controller => 'news', :action => 'index', :project_id => @project else @@ -83,6 +86,8 @@ class NewsController < ApplicationController def update if request.put? and @news.update_attributes(params[:news]) + attachments = Attachment.attach_files(@news, params[:attachments]) + render_attachment_warning_if_needed(@news) flash[:notice] = l(:notice_successful_update) redirect_to :action => 'show', :id => @news else diff --git a/app/models/news.rb b/app/models/news.rb index 763063d13..78dcc0c8c 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -24,6 +24,7 @@ class News < ActiveRecord::Base validates_length_of :title, :maximum => 60 validates_length_of :summary, :maximum => 255 + acts_as_attachable :delete_permission => :manage_news acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}} acts_as_activity_provider :find_options => {:include => [:project, :author]}, diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb index a3eb87e36..0d181a330 100644 --- a/app/views/news/_form.html.erb +++ b/app/views/news/_form.html.erb @@ -3,6 +3,7 @@ <p><%= f.text_field :title, :required => true, :size => 60 %></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 id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p> </div> - + <%= wikitoolbar_for 'news_description' %> diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb index 182f22fbe..f00a024c1 100644 --- a/app/views/news/edit.html.erb +++ b/app/views/news/edit.html.erb @@ -1,6 +1,6 @@ <h2><%=l(:label_news)%></h2> -<% labelled_form_for @news, :html => { :id => 'news-form', :method => :put } do |f| %> +<% labelled_form_for @news, :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_save) %> <%= link_to_remote l(:label_preview), diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index 4d13d3a32..d0370c03f 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -8,7 +8,7 @@ <div id="add-news" style="display:none;"> <h2><%=l(:label_news_new)%></h2> <% labelled_form_for @news, :url => project_news_index_path(@project), - :html => { :id => 'news-form' } do |f| %> + :html => { :id => 'news-form', :multipart => true } do |f| %> <%= render :partial => 'news/form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> <%= link_to_remote l(:label_preview), diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb index e0092878e..1c55215b7 100644 --- a/app/views/news/new.html.erb +++ b/app/views/news/new.html.erb @@ -1,7 +1,7 @@ <h2><%=l(:label_news_new)%></h2> <% labelled_form_for @news, :url => project_news_index_path(@project), - :html => { :id => 'news-form' } do |f| %> + :html => { :id => 'news-form', :multipart => true } do |f| %> <%= render :partial => 'news/form', :locals => { :f => f } %> <%= submit_tag l(:button_create) %> <%= link_to_remote l(:label_preview), diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index 2ffed80e0..72c18d9a6 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -17,7 +17,7 @@ <% if authorize_for('news', 'edit') %> <div id="edit-news" style="display:none;"> <% labelled_form_for :news, @news, :url => news_path(@news), - :html => { :id => 'news-form', :method => :put } do |f| %> + :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> <%= submit_tag l(:button_save) %> <%= link_to_remote l(:label_preview), @@ -35,8 +35,9 @@ <p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %> <span class="author"><%= authoring @news.created_on, @news.author %></span></p> <div class="wiki"> -<%= textilizable(@news.description) %> +<%= textilizable(@news, :description) %> </div> +<%= link_to_attachments @news %> <br /> <div id="comments" style="margin-bottom:16px;"> |