diff --git a/config/routes.rb b/config/routes.rb index 55b6ffe84..4832965c9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,14 +14,10 @@ ActionController::Routing::Routes.draw do |map| map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow' map.connect 'help/:ctrl/:page', :controller => 'help' - map.bulk_edit_time_entry 'time_entries/bulk_edit', - :controller => 'timelog', :action => 'bulk_edit', :conditions => { :method => :get } - map.bulk_update_time_entry 'time_entries/bulk_edit', - :controller => 'timelog', :action => 'bulk_update', :conditions => { :method => :post } map.time_entries_context_menu '/time_entries/context_menu', :controller => 'context_menus', :action => 'time_entries' - map.resources :time_entries, :controller => 'timelog', :collection => {:report => :get} + map.resources :time_entries, :controller => 'timelog', :collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post} map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post} map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}