jro_apps/redmine Commit - r3970:41c055363ee4

Refactor: split FilesController#new into #new and #create....

Eric Davis -

r3970:41c055363ee4

parent child

Context file:

r3970:41c055363ee4

app/controllers/files_controller.rb +10 -11

@@ -19,19 +19,18 class FilesController < ApplicationController
19	render :layout => !request.xhr?	19	render :layout => !request.xhr?
20	end	20	end
21		21
22	# TODO: split method into new (GET) and create (POST)
23	def new	22	def new
24	if request.post?	23	@versions = @project.versions.sort
25	container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))	24	end
26	attachments = Attachment.attach_files(container, params[:attachments])
27	render_attachment_warning_if_needed(container)
28		25
29	if !attachments.empty? && Setting.notified_events.include?('file_added')	26	def create
30	Mailer.deliver_attachments_added(attachments[:files])	27	container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
31	end	28	attachments = Attachment.attach_files(container, params[:attachments])
32	redirect_to :controller => 'files', :action => 'index', :id => @project	29	render_attachment_warning_if_needed(container)
33	return	30
		31	if !attachments.empty? && Setting.notified_events.include?('file_added')
		32	Mailer.deliver_attachments_added(attachments[:files])
34	end	33	end
35	@versions = @project.versions.sort	34	redirect_to :controller => 'files', :action => 'index', :id => @project
36	end	35	end
37	end	36	end

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

             <%= error_messages_for 'attachment' %>
             <div class="box">
-            <% form_tag({ :action => 'new', :id => @project }, :multipart => true, :class => "tabular") do %>
+            <% form_tag({ :action => 'create', :id => @project }, :multipart => true, :class => "tabular") do %>
             <% if @versions.any? %>
             <p><label for="version_id"><%=l(:field_version)%></label>

config/routes.rb +1 -1

                 end
                 project_mapper.with_options :conditions => {:method => :post} do |project_actions|
-                  project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
+                  project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'create'
                 end
               end

lib/redmine.rb +1 -1

               end
               map.project_module :files do |map|
-                map.permission :manage_files, {:files => :new}, :require => :loggedin
+                map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                 map.permission :view_files, :files => :index, :versions => :download
               end

test/functional/files_controller_test.rb +4 -4

                                :attributes => { :href => '/attachments/download/9/version_file.zip' }
               end
-              def test_add_file
+              def test_create_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Attachment.count' do
-                  post :new, :id => 1, :version_id => '',
+                  post :create, :id => 1, :version_id => '',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   assert_response :redirect
                 end
                 assert mail.body.include?('testfile.txt')
               end
-              def test_add_version_file
+              def test_create_version_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 assert_difference 'Attachment.count' do
-                  post :new, :id => 1, :version_id => '2',
+                  post :create, :id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   assert_response :redirect
                 end

test/integration/routing_test.rb +1 -1

                 should_route :post, "/projects", :controller => 'projects', :action => 'create'
                 should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml'
-                should_route :post, "/projects/33/files/new", :controller => 'files', :action => 'new', :id => '33'
+                should_route :post, "/projects/33/files/new", :controller => 'files', :action => 'create', :id => '33'
                 should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64'
                 should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64'

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