jro_apps/redmine Commit - r3971:1b90703157a1

Refactor: convert FilesController to a restful resource....

Eric Davis -

r3971:1b90703157a1

parent child

Context file:

r3971:1b90703157a1

Collapse all files

app/controllers/files_controller.rb +2 -2

             class FilesController < ApplicationController
               menu_item :files
-              before_filter :find_project
+              before_filter :find_project_by_project_id
               before_filter :authorize
               helper :sort
                 if !attachments.empty? && Setting.notified_events.include?('file_added')
                   Mailer.deliver_attachments_added(attachments[:files])
                 end
-                redirect_to :controller => 'files', :action => 'index', :id => @project
+                redirect_to project_files_path(@project)
               end
             end

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

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

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

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

config/routes.rb +1 -6

                 :unarchive => :post
               } do |project|
                 project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
+                project.resources :files, :only => [:index, :new, :create]
               end
               # Destroy uses a get request to prompt the user before the actual DELETE request
               # TODO: port to be part of the resources route(s)
               map.with_options :controller => 'projects' do |project_mapper|
                 project_mapper.with_options :conditions => {:method => :get} do |project_views|
-                  project_views.connect 'projects/:id/files', :controller => 'files', :action => 'index'
-                  project_views.connect 'projects/:id/files/new', :controller => 'files', :action => 'new'
                   project_views.connect 'projects/:id/settings/:tab', :controller => 'projects', :action => 'settings'
                   project_views.connect 'projects/:project_id/issues/:copy_from/copy', :controller => 'issues', :action => 'new'
                 end
-                project_mapper.with_options :conditions => {:method => :post} do |project_actions|
-                  project_actions.connect 'projects/:id/files/new', :controller => 'files', :action => 'create'
-                end
               end
               map.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|

lib/redmine.rb +1 -1

                           :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 => 'files', :action => 'index' }, :caption => :label_file_plural
+              menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
               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/files_controller_test.rb +3 -3

               end
               def test_index
-                get :index, :id => 1
+                get :index, :project_id => 1
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:containers)
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Attachment.count' do
-                  post :create, :id => 1, :version_id => '',
+                  post :create, :project_id => 1, :version_id => '',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   assert_response :redirect
                 end
                 Setting.notified_events = ['file_added']
                 assert_difference 'Attachment.count' do
-                  post :create, :id => 1, :version_id => '2',
+                  post :create, :project_id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                   assert_response :redirect
                 end

test/integration/routing_test.rb +3 -3

                 should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
                 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/33/files", :controller => 'files', :action => 'index', :id => '33'
+                should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :project_id => '33'
-                should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :id => '33'
+                should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :project_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", :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 => 'create', :id => '33'
+                should_route :post, "/projects/33/files", :controller => 'files', :action => 'create', :project_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

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