jro_apps/redmine Commit - r8608:24138187eb13

Allows attachments on news (#1972)....

Jean-Philippe Lang -

r8608:24138187eb13

parent child

Context file:

r8608:24138187eb13

Collapse all files

app/controllers/news_controller.rb +5 0

               accept_api_auth :index
               helper :watchers
+              helper :attachments
               def index
                 case params[:format]
                 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
               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

app/models/news.rb +1 0

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

app/views/news/_form.html.erb +2 -1

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

app/views/news/edit.html.erb +1 -1

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

app/views/news/index.html.erb +1 -1

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

app/views/news/new.html.erb +1 -1

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

app/views/news/show.html.erb +3 -2

             <% 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),
             <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;">

test/functional/news_controller_test.rb +49 -10

@@ -53,6 +53,16 class NewsControllerTest < ActionController::TestCase
53	assert_tag :tag => 'h2', :content => /eCookbook first release/	53	assert_tag :tag => 'h2', :content => /eCookbook first release/
54	end	54	end
55		55
		56	def test_show_should_show_attachments
		57	attachment = Attachment.first
		58	attachment.container = News.find(1)
		59	attachment.save!
		60
		61	get :show, :id => 1
		62	assert_response :success
		63	assert_tag 'a', :content => attachment.filename
		64	end
		65
56	def test_show_not_found	66	def test_show_not_found
57	get :show, :id => 999	67	get :show, :id => 999
58	assert_response 404	68	assert_response 404
@@ -83,6 +93,34 class NewsControllerTest < ActionController::TestCase
83	assert_equal 1, ActionMailer::Base.deliveries.size	93	assert_equal 1, ActionMailer::Base.deliveries.size
84	end	94	end
85		95
		96	def test_post_create_with_attachment
		97	set_tmp_attachments_directory
		98	@request.session[:user_id] = 2
		99	assert_difference 'News.count' do
		100	assert_difference 'Attachment.count' do
		101	post :create, :project_id => 1,
		102	:news => { :title => 'Test', :description => 'This is the description' },
		103	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
		104	end
		105	end
		106	attachment = Attachment.first(:order => 'id DESC')
		107	news = News.first(:order => 'id DESC')
		108	assert_equal news, attachment.container
		109	end
		110
		111	def test_post_create_with_validation_failure
		112	@request.session[:user_id] = 2
		113	post :create, :project_id => 1, :news => { :title => '',
		114	:description => 'This is the description',
		115	:summary => '' }
		116	assert_response :success
		117	assert_template 'new'
		118	assert_not_nil assigns(:news)
		119	assert assigns(:news).new_record?
		120	assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },
		121	:content => /1 error/
		122	end
		123
86	def test_get_edit	124	def test_get_edit
87	@request.session[:user_id] = 2	125	@request.session[:user_id] = 2
88	get :edit, :id => 1	126	get :edit, :id => 1
@@ -98,17 +136,18 class NewsControllerTest < ActionController::TestCase
98	assert_equal 'Description changed by test_post_edit', news.description	136	assert_equal 'Description changed by test_post_edit', news.description
99	end	137	end
100		138
101	def test_p~~ost_create_with_validation_failure~~	139	def test_put_update_with_attachment
		140	set_tmp_attachments_directory
102	@request.session[:user_id] = 2	141	@request.session[:user_id] = 2
103	post :create, :project_id => 1, :news => { :title => '',	142	assert_no_difference 'News.count' do
104	:description => 'This is the description',	143	assert_difference 'Attachment.count' do
105	:summary => '' }	144	put :update, :id => 1,
106	assert_response :success	145	:news => { :description => 'This is the description' },
107	assert_template 'new'	146	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
108	assert_not_nil assigns(:news)	147	end
109	assert assigns(:news).new_record?	148	end
110	assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },	149	attachment = Attachment.first(:order => 'id DESC')
111	:content => /1 error/	150	assert_equal News.find(1), attachment.container
112	end	151	end
113		152
114	def test_destroy	153	def test_destroy

test/unit/news_test.rb +15 0

@@ -71,4 +71,19 class NewsTest < ActiveSupport::TestCase
71	10.times { projects(:projects_001).news.create(valid_news) }	71	10.times { projects(:projects_001).news.create(valid_news) }
72	assert_equal 5, News.latest(users(:users_004)).size	72	assert_equal 5, News.latest(users(:users_004)).size
73	end	73	end
		74
		75	def test_attachments_should_be_visible
		76	assert News.find(1).attachments_visible?(User.anonymous)
		77	end
		78
		79	def test_attachments_should_be_deletable_with_manage_news_permission
		80	manager = User.find(2)
		81	assert News.find(1).attachments_deletable?(manager)
		82	end
		83
		84	def test_attachments_should_not_be_deletable_without_manage_news_permission
		85	manager = User.find(2)
		86	Role.find_by_name('Manager').remove_permission!(:manage_news)
		87	assert !News.find(1).attachments_deletable?(manager)
		88	end
74	end	89	end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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