jro_apps/redmine Commit - r3937:daa8eaa9aebc

Refactor: move method, ProjectsController#list_files to FilesController#index....

Eric Davis -

r3937:daa8eaa9aebc

parent child

Context file:

r3937:daa8eaa9aebc

Collapse all files

app/controllers/files_controller.rb created 644 +22 0

@@ -0,0 +1,22
	1	class FilesController < ApplicationController
	2	menu_item :files
	3
	4	before_filter :find_project
	5	before_filter :authorize
	6
	7	helper :sort
	8	include SortHelper
	9
	10	def index
	11	sort_init 'filename', 'asc'
	12	sort_update 'filename' => "#{Attachment.table_name}.filename",
	13	'created_on' => "#{Attachment.table_name}.created_on",
	14	'size' => "#{Attachment.table_name}.filesize",
	15	'downloads' => "#{Attachment.table_name}.downloads"
	16
	17	@containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
	18	@containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
	19	render :layout => !request.xhr?
	20	end
	21
	22	end

test/functional/files_controller_test.rb created 644 +29 0

@@ -0,0 +1,29
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class FilesControllerTest < ActionController::TestCase
	4	fixtures :all
	5
	6	def setup
	7	@controller = FilesController.new
	8	@request = ActionController::TestRequest.new
	9	@response = ActionController::TestResponse.new
	10	@request.session[:user_id] = nil
	11	Setting.default_language = 'en'
	12	end
	13
	14	def test_index
	15	get :index, :id => 1
	16	assert_response :success
	17	assert_template 'index'
	18	assert_not_nil assigns(:containers)
	19
	20	# file attached to the project
	21	assert_tag :a, :content => 'project_file.zip',
	22	:attributes => { :href => '/attachments/download/8/project_file.zip' }
	23
	24	# file attached to a project's version
	25	assert_tag :a, :content => 'version_file.zip',
	26	:attributes => { :href => '/attachments/download/9/version_file.zip' }
	27	end
	28
	29	end

app/controllers/projects_controller.rb +2 -14

             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :roadmap, :only => :roadmap
-              menu_item :files, :only => [:list_files, :add_file]
+              menu_item :files, :only => [:add_file]
               menu_item :settings, :only => :settings
               before_filter :find_project, :except => [ :index, :list, :add, :copy ]
                   if !attachments.empty? && Setting.notified_events.include?('file_added')
                     Mailer.deliver_attachments_added(attachments[:files])
                   end
-                  redirect_to :controller => 'projects', :action => 'list_files', :id => @project
+                  redirect_to :controller => 'files', :action => 'index', :id => @project
                   return
                 end
                 @versions = @project.versions.sort
                 redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
               end
-              def list_files
-                sort_init 'filename', 'asc'
-                sort_update 'filename' => "#{Attachment.table_name}.filename",
-                            'created_on' => "#{Attachment.table_name}.created_on",
-                            'size' => "#{Attachment.table_name}.filesize",
-                            'downloads' => "#{Attachment.table_name}.downloads"
-                @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
-                @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
-                render :layout => !request.xhr?
-              end
             private
               def find_optional_project
                 return true unless params[:id]

app/views/files/index.html.erb ~~app/views/projects/list_files.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/list_files.rhtml to app/views/files/index.html.erb

config/routes.rb +1 -1

                   project_views.connect 'projects/:id', :action => 'show'
                   project_views.connect 'projects/:id.:format', :action => 'show'
                   project_views.connect 'projects/:id/:action', :action => /destroy|settings/
-                  project_views.connect 'projects/:id/files', :action => 'list_files'
+                  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/settings/:tab', :action => 'settings'
                   project_views.connect 'projects/:project_id/issues/:copy_from/copy', :controller => 'issues', :action => 'new'

lib/redmine.rb +2 -2

               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
-                map.permission :view_files, :projects => :list_files, :versions => :download
+                map.permission :view_files, :files => :index, :versions => :download
               end
               map.project_module :wiki do |map|
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
-              menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_file_plural
+              menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true

test/functional/projects_controller_test.rb 0 -15

@@ -353,21 +353,6 class ProjectsControllerTest < ActionController::TestCase
353	assert_equal Version.find(2), a.container	353	assert_equal Version.find(2), a.container
354	end	354	end
355		355
356	def test_list_files
357	get :list_files, :id => 1
358	assert_response :success
359	assert_template 'list_files'
360	assert_not_nil assigns(:containers)
361
362	# file attached to the project
363	assert_tag :a, :content => 'project_file.zip',
364	:attributes => { :href => '/attachments/download/8/project_file.zip' }
365
366	# file attached to a project's version
367	assert_tag :a, :content => 'version_file.zip',
368	:attributes => { :href => '/attachments/download/9/version_file.zip' }
369	end
370
371	def test_archive	356	def test_archive
372	@request.session[:user_id] = 1 # admin	357	@request.session[:user_id] = 1 # admin
373	post :archive, :id => 1	358	post :archive, :id => 1

test/integration/routing_test.rb +1 -1

                 should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223'
                 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 => 'projects', :action => 'list_files', :id => '33'
+                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/roadmap", :controller => 'versions', :action => 'index', :project_id => '33'
                 should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33'

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