##// END OF EJS Templates
jro_apps » redmine
RSS
Moved bulk_edit/update routes into issues resources....
Jean-Philippe Lang -
r8028:ac6e4045473f
parent child
Show More
Side by Side Unified
Context file:
r8028:ac6e4045473f Loading diff...:
Show file before | Show file after | Hide comments
@@ -44,8 +44,6 ActionController::Routing::Routes.draw do |map|
44 map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
44 map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
45 map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
45 map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
46 map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
46 map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
47 map.bulk_edit_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_edit', :conditions => { :method => :get }
48 map.bulk_update_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_update', :conditions => { :method => :post }
49 map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
47 map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
50 map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
48 map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
51
49
@@ -65,7 +63,7 ActionController::Routing::Routes.draw do |map|
65 reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
63 reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
66 end
64 end
67
65
68 map.resources :issues do |issues|
66 map.resources :issues, :collection => {:bulk_edit => :get, :bulk_update => :post} do |issues|
69 issues.resources :time_entries, :controller => 'timelog', :collection => {:report => :get}
67 issues.resources :time_entries, :controller => 'timelog', :collection => {:report => :get}
70 issues.resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
68 issues.resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
71 end
69 end
Show file before | Show file after | Hide comments
@@ -124,7 +124,7 class RoutingTest < ActionController::IntegrationTest
124 should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
124 should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
125
125
126 should_route :get, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_edit'
126 should_route :get, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_edit'
127 should_route :post, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_update'
127 should_route :post, "/issues/bulk_update", :controller => 'issues', :action => 'bulk_update'
128 end
128 end
129
129
130 context "issue categories" do
130 context "issue categories" do
General Comments 0
You need to be logged in to leave comments. Login now