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

route: move time entries matchings and resources after /issues matchings 

Time log tests pass except /time_entries delete action on Rails 3.0.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8446 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-12-31 06:19:12 +00:00
parent d17b4c8e4f
commit 25ead5fd42
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/routes.rb
View File

@ -19,15 +19,6 @@ ActionController::Routing::Routes.draw do |map|
map.connect 'account/activate', :controller => 'account', :action => 'activate', map.connect 'account/activate', :controller => 'account', :action => 'activate',
:conditions => {:method => :get} :conditions => {:method => :get}
map.connect '/time_entries/destroy',
:controller => 'timelog', :action => 'destroy',
:conditions => { :method => :delete }
map.time_entries_context_menu '/time_entries/context_menu',
:controller => 'context_menus', :action => 'time_entries'
map.resources :time_entries, :controller => 'timelog',
:collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post}
map.connect 'projects/:id/wiki', :controller => 'wikis', map.connect 'projects/:id/wiki', :controller => 'wikis',
:action => 'edit', :conditions => {:method => :post} :action => 'edit', :conditions => {:method => :post}
map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', map.connect 'projects/:id/wiki/destroy', :controller => 'wikis',
@ -215,6 +206,15 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/issues', :controller => 'issues', :action => 'destroy', map.connect '/issues', :controller => 'issues', :action => 'destroy',
:conditions => {:method => :delete} :conditions => {:method => :delete}
map.connect '/time_entries/destroy',
:controller => 'timelog', :action => 'destroy',
:conditions => { :method => :delete }
map.time_entries_context_menu '/time_entries/context_menu',
:controller => 'context_menus', :action => 'time_entries'
map.resources :time_entries, :controller => 'timelog',
:collection => {:report => :get, :bulk_edit => :get, :bulk_update => :post}
map.with_options :controller => 'activities', :action => 'index', map.with_options :controller => 'activities', :action => 'index',
:conditions => {:method => :get} do |activity| :conditions => {:method => :get} do |activity|
activity.connect 'projects/:id/activity' activity.connect 'projects/:id/activity'