@@ -19,15 +19,6 ActionController::Routing::Routes.draw do |map| | |||||
19 | map.connect 'account/activate', :controller => 'account', :action => 'activate', |
|
19 | map.connect 'account/activate', :controller => 'account', :action => 'activate', | |
20 | :conditions => {:method => :get} |
|
20 | :conditions => {:method => :get} | |
21 |
|
21 | |||
22 | map.connect '/time_entries/destroy', |
|
|||
23 | :controller => 'timelog', :action => 'destroy', |
|
|||
24 | :conditions => { :method => :delete } |
|
|||
25 | map.time_entries_context_menu '/time_entries/context_menu', |
|
|||
26 | :controller => 'context_menus', :action => 'time_entries' |
|
|||
27 |
|
||||
28 | map.resources :time_entries, :controller => 'timelog', |
|
|||
29 | :collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post} |
|
|||
30 |
|
||||
31 | map.connect 'projects/:id/wiki', :controller => 'wikis', |
|
22 | map.connect 'projects/:id/wiki', :controller => 'wikis', | |
32 | :action => 'edit', :conditions => {:method => :post} |
|
23 | :action => 'edit', :conditions => {:method => :post} | |
33 | map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', |
|
24 | map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', | |
@@ -215,6 +206,15 ActionController::Routing::Routes.draw do |map| | |||||
215 | map.connect '/issues', :controller => 'issues', :action => 'destroy', |
|
206 | map.connect '/issues', :controller => 'issues', :action => 'destroy', | |
216 | :conditions => {:method => :delete} |
|
207 | :conditions => {:method => :delete} | |
217 |
|
208 | |||
|
209 | map.connect '/time_entries/destroy', | |||
|
210 | :controller => 'timelog', :action => 'destroy', | |||
|
211 | :conditions => { :method => :delete } | |||
|
212 | map.time_entries_context_menu '/time_entries/context_menu', | |||
|
213 | :controller => 'context_menus', :action => 'time_entries' | |||
|
214 | ||||
|
215 | map.resources :time_entries, :controller => 'timelog', | |||
|
216 | :collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post} | |||
|
217 | ||||
218 | map.with_options :controller => 'activities', :action => 'index', |
|
218 | map.with_options :controller => 'activities', :action => 'index', | |
219 | :conditions => {:method => :get} do |activity| |
|
219 | :conditions => {:method => :get} do |activity| | |
220 | activity.connect 'projects/:id/activity' |
|
220 | activity.connect 'projects/:id/activity' |
General Comments 0
You need to be logged in to leave comments.
Login now