kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

route: change order of some issues and projects resources and matchings 

This change passes issues and projects routing tests on Rails 3.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8441 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-12-30 14:55:05 +00:00
parent dbc78746d2
commit 561f7090c8
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
config/routes.rb
View File

@ -109,18 +109,6 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'my/order_blocks', :controller => 'my', :action => 'order_blocks', map.connect 'my/order_blocks', :controller => 'my', :action => 'order_blocks',
:conditions => {:method => :post} :conditions => {:method => :post}
map.resources :issues,
:collection => {:bulk_edit => :get, :bulk_update => :post} do |issues|
issues.resources :time_entries, :controller => 'timelog',
:collection => {:report => :get}
issues.resources :relations, :shallow => true,
:controller => 'issue_relations',
:only => [:index, :show, :create, :destroy]
end
# Bulk deletion
map.connect '/issues', :controller => 'issues', :action => 'destroy',
:conditions => {:method => :delete}
map.connect 'projects/:id/members/new', :controller => 'members', map.connect 'projects/:id/members/new', :controller => 'members',
:action => 'new', :conditions => { :method => :post } :action => 'new', :conditions => { :method => :post }
map.connect 'members/edit/:id', :controller => 'members', map.connect 'members/edit/:id', :controller => 'members',
@ -163,6 +151,14 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch', map.connect 'watchers/unwatch', :controller=> 'watchers', :action => 'unwatch',
:conditions => {:method => :post} :conditions => {:method => :post}
# TODO: port to be part of the resources route(s)
map.with_options :conditions => {:method => :get} do |project_views|
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
map.resources :projects, :member => { map.resources :projects, :member => {
:copy => [:get, :post], :copy => [:get, :post],
:settings => :get, :settings => :get,
@ -208,13 +204,17 @@ ActionController::Routing::Routes.draw do |map|
end end
# TODO: port to be part of the resources route(s) map.resources :issues,
map.with_options :conditions => {:method => :get} do |project_views| :collection => {:bulk_edit => :get, :bulk_update => :post} do |issues|
project_views.connect 'projects/:id/settings/:tab', issues.resources :time_entries, :controller => 'timelog',
:controller => 'projects', :action => 'settings' :collection => {:report => :get}
project_views.connect 'projects/:project_id/issues/:copy_from/copy', issues.resources :relations, :shallow => true,
:controller => 'issues', :action => 'new' :controller => 'issue_relations',
:only => [:index, :show, :create, :destroy]
end end
# Bulk deletion
map.connect '/issues', :controller => 'issues', :action => 'destroy',
:conditions => {:method => :delete}
map.with_options :controller => 'activities', :action => 'index', map.with_options :controller => 'activities', :action => 'index',
:conditions => {:method => :get} do |activity| :conditions => {:method => :get} do |activity|