| @@ -29,7 +29,7 ActionController::Routing::Routes.draw do |map| | |||
|
|
29 | 29 | :controller => 'timelog', :action => 'bulk_update', :conditions => { :method => :post } |
|
|
30 | 30 | map.time_entries_context_menu '/time_entries/context_menu', |
|
|
31 | 31 | :controller => 'context_menus', :action => 'time_entries' |
|
|
32 | # TODO: wasteful since this is also nested under issues, projects, and projects/issues | |
|
|
32 | ||
|
|
33 | 33 | map.resources :time_entries, :controller => 'timelog' |
|
|
34 | 34 | |
|
|
35 | 35 | map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} |
| @@ -92,15 +92,11 ActionController::Routing::Routes.draw do |map| | |||
|
|
92 | 92 | reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details' |
|
|
93 | 93 | end |
|
|
94 | 94 | |
|
|
95 | map.resources :issues, :member => { :edit => :post }, :collection => {} do |issues| | |
|
|
95 | map.resources :issues do |issues| | |
|
|
96 | 96 | issues.resources :time_entries, :controller => 'timelog' |
|
|
97 | 97 | issues.resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy] |
|
|
98 | 98 | end |
|
|
99 | 99 | |
|
|
100 | map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post } do |issues| | |
|
|
101 | issues.resources :time_entries, :controller => 'timelog' | |
|
|
102 | end | |
|
|
103 | ||
|
|
104 | 100 | map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new' |
|
|
105 | 101 | |
|
|
106 | 102 | map.with_options :controller => 'users' do |users| |
| @@ -135,6 +131,9 ActionController::Routing::Routes.draw do |map| | |||
|
|
135 | 131 | :unarchive => :post |
|
|
136 | 132 | } do |project| |
|
|
137 | 133 | project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy] |
|
|
134 | project.resources :issues, :only => [:index, :new, :create] do |issues| | |
|
|
135 | issues.resources :time_entries, :controller => 'timelog' | |
|
|
136 | end | |
|
|
138 | 137 | project.resources :files, :only => [:index, :new, :create] |
|
|
139 | 138 | project.resources :versions, :shallow => true, :collection => {:close_completed => :put}, :member => {:status_by => :post} |
|
|
140 | 139 | project.resources :news, :shallow => true |
| @@ -213,7 +212,6 ActionController::Routing::Routes.draw do |map| | |||
|
|
213 | 212 | map.resources :issue_statuses, :except => :show, :collection => {:update_issue_done_ratio => :post} |
|
|
214 | 213 | |
|
|
215 | 214 | #left old routes at the bottom for backwards compat |
|
|
216 | map.connect 'projects/:project_id/issues/:action', :controller => 'issues' | |
|
|
217 | 215 | map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards' |
|
|
218 | 216 | map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages' |
|
|
219 | 217 | map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki' |
| @@ -83,8 +83,6 class RoutingTest < ActionController::IntegrationTest | |||
|
|
83 | 83 | should_route :post, "/issues.xml", :controller => 'issues', :action => 'create', :format => 'xml' |
|
|
84 | 84 | |
|
|
85 | 85 | should_route :get, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64' |
|
|
86 | # TODO: Should use PUT | |
|
|
87 | should_route :post, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64' | |
|
|
88 | 86 | should_route :put, "/issues/1.xml", :controller => 'issues', :action => 'update', :id => '1', :format => 'xml' |
|
|
89 | 87 | |
|
|
90 | 88 | # TODO: Should use DELETE |
General Comments 0
You need to be logged in to leave comments.
Login now