9c7a3b8689e6ca55c49cc9fd2a64558f395f382c

Author: gwoo

Date: 2010-08-02 15:03:04 -0700

moving some routes around

diff --git a/config/routes.php b/config/routes.php index 932f5f1..914f2a7 100644 --- a/config/routes.php +++ b/config/routes.php @@ -20,12 +20,6 @@ Router::connect('/feed', array('controller' => 'dashboard', 'action' => 'feed')) Router::connect('/admin/:controller', array('admin'=> true)); Router::connect('/admin/:controller/:action/*', array('admin'=> true)); -Router::connect('/forks/:fork/:project/admin/:controller', array('admin'=> true), array('fork' => '[\-_\.a-zA-Z0-9]{3,}')); -Router::connect('/forks/:fork/:project/admin/:controller/:action/*', array('admin'=> true), array('fork' => '[\-_\.a-zA-Z0-9]{3,}')); - -Router::connect('/:project/admin/:controller', array('admin'=> true, 'controller' => 'dashboard')); -Router::connect('/:project/admin/:controller/:action/*', array('admin'=> true, 'controller' => 'dashboard')); - /* Specific Routes */ Router::connect('/fork/it', array('controller' => 'repo', 'action' => 'fork_it'), array('action' => 'fork_it')); Router::connect('/:project/fork/it', array('controller' => 'repo', 'action' => 'fork_it'), array('action' => 'fork_it')); @@ -88,3 +82,9 @@ Router::connect('/:project/:controller/*', array('action' => 'index'), array( 'controller' => 'source|wiki|commits|tickets|comments|timeline|versions|users|projects', ) ); + +Router::connect('/forks/:fork/:project/admin/:controller', array('admin'=> true), array('fork' => '[\-_\.a-zA-Z0-9]{3,}')); +Router::connect('/forks/:fork/:project/admin/:controller/:action/*', array('admin'=> true), array('fork' => '[\-_\.a-zA-Z0-9]{3,}')); + +Router::connect('/:project/admin/:controller', array('admin'=> true, 'controller' => 'dashboard')); +Router::connect('/:project/admin/:controller/:action/*', array('admin'=> true, 'controller' => 'dashboard'));