Allows attachments on news (#1972).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8728 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-01-29 22:39:06 +00:00
parent 992aebf6df
commit 24138187eb
9 changed files with 80 additions and 18 deletions

View File

@ -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

View File

@ -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]},

View File

@ -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' %>

View File

@ -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),

View File

@ -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),

View File

@ -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),

View File

@ -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;">

View File

@ -53,6 +53,16 @@ class NewsControllerTest < ActionController::TestCase
assert_tag :tag => 'h2', :content => /eCookbook first release/
end
def test_show_should_show_attachments
attachment = Attachment.first
attachment.container = News.find(1)
attachment.save!
get :show, :id => 1
assert_response :success
assert_tag 'a', :content => attachment.filename
end
def test_show_not_found
get :show, :id => 999
assert_response 404
@ -83,19 +93,19 @@ class NewsControllerTest < ActionController::TestCase
assert_equal 1, ActionMailer::Base.deliveries.size
end
def test_get_edit
def test_post_create_with_attachment
set_tmp_attachments_directory
@request.session[:user_id] = 2
get :edit, :id => 1
assert_response :success
assert_template 'edit'
end
def test_put_update
@request.session[:user_id] = 2
put :update, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
assert_redirected_to '/news/1'
news = News.find(1)
assert_equal 'Description changed by test_post_edit', news.description
assert_difference 'News.count' do
assert_difference 'Attachment.count' do
post :create, :project_id => 1,
:news => { :title => 'Test', :description => 'This is the description' },
:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
end
end
attachment = Attachment.first(:order => 'id DESC')
news = News.first(:order => 'id DESC')
assert_equal news, attachment.container
end
def test_post_create_with_validation_failure
@ -111,6 +121,35 @@ class NewsControllerTest < ActionController::TestCase
:content => /1 error/
end
def test_get_edit
@request.session[:user_id] = 2
get :edit, :id => 1
assert_response :success
assert_template 'edit'
end
def test_put_update
@request.session[:user_id] = 2
put :update, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
assert_redirected_to '/news/1'
news = News.find(1)
assert_equal 'Description changed by test_post_edit', news.description
end
def test_put_update_with_attachment
set_tmp_attachments_directory
@request.session[:user_id] = 2
assert_no_difference 'News.count' do
assert_difference 'Attachment.count' do
put :update, :id => 1,
:news => { :description => 'This is the description' },
:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
end
end
attachment = Attachment.first(:order => 'id DESC')
assert_equal News.find(1), attachment.container
end
def test_destroy
@request.session[:user_id] = 2
delete :destroy, :id => 1

View File

@ -71,4 +71,19 @@ class NewsTest < ActiveSupport::TestCase
10.times { projects(:projects_001).news.create(valid_news) }
assert_equal 5, News.latest(users(:users_004)).size
end
def test_attachments_should_be_visible
assert News.find(1).attachments_visible?(User.anonymous)
end
def test_attachments_should_be_deletable_with_manage_news_permission
manager = User.find(2)
assert News.find(1).attachments_deletable?(manager)
end
def test_attachments_should_not_be_deletable_without_manage_news_permission
manager = User.find(2)
Role.find_by_name('Manager').remove_permission!(:manage_news)
assert !News.find(1).attachments_deletable?(manager)
end
end