jro_apps/redmine Commit - r4008:973c54d49b44

Merged r4052 from trunk....

Eric Davis -

r4008:973c54d49b44

parent child

Context file:

r4008:973c54d49b44

Collapse all files

app/controllers/files_controller.rb +15 0

@@ -19,4 +19,19 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
		24	if request.post?
		25	container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
		26	attachments = Attachment.attach_files(container, params[:attachments])
		27	render_attachment_warning_if_needed(container)
		28
		29	if !attachments.empty? && Setting.notified_events.include?('file_added')
		30	Mailer.deliver_attachments_added(attachments[:files])
		31	end
		32	redirect_to :controller => 'files', :action => 'index', :id => @project
		33	return
		34	end
		35	@versions = @project.versions.sort
		36	end
22	end	37	end

app/controllers/projects_controller.rb 0 -16

             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :roadmap, :only => :roadmap
-              menu_item :files, :only => [:add_file]
               menu_item :settings, :only => :settings
               before_filter :find_project, :except => [ :index, :list, :add, :copy ]
                 @project = nil
               end
-              def add_file
-                if request.post?
-                  container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-                  attachments = Attachment.attach_files(container, params[:attachments])
-                  render_attachment_warning_if_needed(container)
-                  if !attachments.empty? && Setting.notified_events.include?('file_added')
-                    Mailer.deliver_attachments_added(attachments[:files])
-                  end
-                  redirect_to :controller => 'files', :action => 'index', :id => @project
-                  return
-                end
-                @versions = @project.versions.sort
-              end
               def save_activities
                 if request.post? && params[:enumerations]
                   Project.transaction do

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

             <div class="contextual">
-            <%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
+            <%= link_to_if_authorized l(:label_attachment_new), {:controller => 'files', :action => 'new', :id => @project}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_attachment_plural)%></h2>

app/views/files/new.html.erb ~~app/views/projects/add_file.rhtml~~ renamed +1 -1

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

config/routes.rb +2 -2

                   project_views.connect 'projects/:id.:format', :action => 'show'
                   project_views.connect 'projects/:id/:action', :action => /destroy|settings/
                   project_views.connect 'projects/:id/files', :controller => 'files', :action => 'index'
-                  project_views.connect 'projects/:id/files/new', :action => 'add_file'
+                  project_views.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
                   project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
                 end
                   project_actions.connect 'projects', :action => 'add'
                   project_actions.connect 'projects.:format', :action => 'add', :format => /xml/
                   project_actions.connect 'projects/:id/:action', :action => /edit|destroy|archive|unarchive/
-                  project_actions.connect 'projects/:id/files/new', :action => 'add_file'
+                  project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
                   project_actions.connect 'projects/:id/activities/save', :action => 'save_activities'
                 end

lib/redmine.rb +1 -1

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

test/functional/files_controller_test.rb +38 0

@@ -26,4 +26,42 class FilesControllerTest < ActionController::TestCase
26	:attributes => { :href => '/attachments/download/9/version_file.zip' }	26	:attributes => { :href => '/attachments/download/9/version_file.zip' }
27	end	27	end
28		28
		29	def test_add_file
		30	set_tmp_attachments_directory
		31	@request.session[:user_id] = 2
		32	Setting.notified_events = ['file_added']
		33	ActionMailer::Base.deliveries.clear
		34
		35	assert_difference 'Attachment.count' do
		36	post :new, :id => 1, :version_id => '',
		37	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
		38	assert_response :redirect
		39	end
		40	assert_redirected_to 'projects/ecookbook/files'
		41	a = Attachment.find(:first, :order => 'created_on DESC')
		42	assert_equal 'testfile.txt', a.filename
		43	assert_equal Project.find(1), a.container
		44
		45	mail = ActionMailer::Base.deliveries.last
		46	assert_kind_of TMail::Mail, mail
		47	assert_equal "[eCookbook] New file", mail.subject
		48	assert mail.body.include?('testfile.txt')
		49	end
		50
		51	def test_add_version_file
		52	set_tmp_attachments_directory
		53	@request.session[:user_id] = 2
		54	Setting.notified_events = ['file_added']
		55
		56	assert_difference 'Attachment.count' do
		57	post :new, :id => 1, :version_id => '2',
		58	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
		59	assert_response :redirect
		60	end
		61	assert_redirected_to 'projects/ecookbook/files'
		62	a = Attachment.find(:first, :order => 'created_on DESC')
		63	assert_equal 'testfile.txt', a.filename
		64	assert_equal Version.find(2), a.container
		65	end
		66
29	end	67	end

test/functional/projects_controller_test.rb 0 -36

@@ -317,42 +317,6 class ProjectsControllerTest < ActionController::TestCase
317	assert_nil Project.find_by_id(1)	317	assert_nil Project.find_by_id(1)
318	end	318	end
319		319
320	def test_add_file
321	set_tmp_attachments_directory
322	@request.session[:user_id] = 2
323	Setting.notified_events = ['file_added']
324	ActionMailer::Base.deliveries.clear
325
326	assert_difference 'Attachment.count' do
327	post :add_file, :id => 1, :version_id => '',
328	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
329	end
330	assert_redirected_to 'projects/ecookbook/files'
331	a = Attachment.find(:first, :order => 'created_on DESC')
332	assert_equal 'testfile.txt', a.filename
333	assert_equal Project.find(1), a.container
334
335	mail = ActionMailer::Base.deliveries.last
336	assert_kind_of TMail::Mail, mail
337	assert_equal "[eCookbook] New file", mail.subject
338	assert mail.body.include?('testfile.txt')
339	end
340
341	def test_add_version_file
342	set_tmp_attachments_directory
343	@request.session[:user_id] = 2
344	Setting.notified_events = ['file_added']
345
346	assert_difference 'Attachment.count' do
347	post :add_file, :id => 1, :version_id => '2',
348	:attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
349	end
350	assert_redirected_to 'projects/ecookbook/files'
351	a = Attachment.find(:first, :order => 'created_on DESC')
352	assert_equal 'testfile.txt', a.filename
353	assert_equal Version.find(2), a.container
354	end
355
356	def test_archive	320	def test_archive
357	@request.session[:user_id] = 1 # admin	321	@request.session[:user_id] = 1 # admin
358	post :archive, :id => 1	322	post :archive, :id => 1

test/integration/routing_test.rb +2 -2

                 should_route :get, "/projects/4223/settings/members", :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
                 should_route :get, "/projects/567/destroy", :controller => 'projects', :action => 'destroy', :id => '567'
                 should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :id => '33'
-                should_route :get, "/projects/33/files/new", :controller => 'projects', :action => 'add_file', :id => '33'
+                should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :id => '33'
                 should_route :get, "/projects/33/roadmap", :controller => 'versions', :action => 'index', :project_id => '33'
                 should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33'
                 should_route :get, "/projects/33/activity.atom", :controller => 'activities', :action => 'index', :id => '33', :format => 'atom'
                 should_route :post, "/projects.xml", :controller => 'projects', :action => 'add', :format => 'xml'
                 should_route :post, "/projects/4223/edit", :controller => 'projects', :action => 'edit', :id => '4223'
                 should_route :post, "/projects/64/destroy", :controller => 'projects', :action => 'destroy', :id => '64'
-                should_route :post, "/projects/33/files/new", :controller => 'projects', :action => 'add_file', :id => '33'
+                should_route :post, "/projects/33/files/new", :controller => 'files', :action => 'new', :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'
                 should_route :post, "/projects/64/activities/save", :controller => 'projects', :action => 'save_activities', :id => '64'

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