From 25ead5fd42dbf9428f7744bf6e056fcbecb7d79a Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 31 Dec 2011 06:19:12 +0000
Subject: [PATCH] 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
---
 config/routes.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 2df646ed1..de69a8a3b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -19,15 +19,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'account/activate', :controller => 'account', :action => 'activate',
               :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',
               :action => 'edit', :conditions => {:method => :post}
   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',
               :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',
                    :conditions => {:method => :get} do |activity|
     activity.connect 'projects/:id/activity'