Fixed bug with project names containing an hyphen (-).

dev
Loic d'Anterroches 2008-09-04 17:19:53 +02:00
parent bef8ac82b7
commit 7dabb32e25
1 changed files with 29 additions and 29 deletions

View File

@ -79,55 +79,55 @@ $ctl[] = array('regex' => '#^/help/$#',
'model' => 'IDF_Views', 'model' => 'IDF_Views',
'method' => 'faq'); 'method' => 'faq');
$ctl[] = array('regex' => '#^/p/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'home'); 'method' => 'home');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'index'); 'method' => 'index');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/search/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/search/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'search'); 'method' => 'search');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/(\d+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/(\d+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'view'); 'method' => 'view');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/(\d+)/star/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/(\d+)/star/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'star'); 'method' => 'star');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/status/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/status/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'listStatus'); 'method' => 'listStatus');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/label/(\d+)/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/label/(\d+)/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'listLabel'); 'method' => 'listLabel');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/create/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/create/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
'method' => 'create'); 'method' => 'create');
$ctl[] = array('regex' => '#^/p/(\w+)/issues/my/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/issues/my/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Issue', 'model' => 'IDF_Views_Issue',
@ -135,49 +135,49 @@ $ctl[] = array('regex' => '#^/p/(\w+)/issues/my/(\w+)/$#',
// ---------- SCM ---------------------------------------- // ---------- SCM ----------------------------------------
$ctl[] = array('regex' => '#^/p/(\w+)/source/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'index'); 'method' => 'index');
$ctl[] = array('regex' => '#^/p/(\w+)/source/tree/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/tree/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'treeBase'); 'method' => 'treeBase');
$ctl[] = array('regex' => '#^/p/(\w+)/source/tree/(\w+)/(.*)$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/tree/(\w+)/(.*)$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'tree'); 'method' => 'tree');
$ctl[] = array('regex' => '#^/p/(\w+)/source/changes/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/changes/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'changeLog'); 'method' => 'changeLog');
$ctl[] = array('regex' => '#^/p/(\w+)/source/commit/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/commit/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'commit'); 'method' => 'commit');
$ctl[] = array('regex' => '#^/p/(\w+)/source/download/(\w+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/download/(\w+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'download'); 'method' => 'download');
$ctl[] = array('regex' => '#^/p/(\w+)/source/treerev/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/treerev/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
'method' => 'treeRev'); 'method' => 'treeRev');
$ctl[] = array('regex' => '#^/p/(\w+)/source/changesrev/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/source/changesrev/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Source', 'model' => 'IDF_Views_Source',
@ -185,37 +185,37 @@ $ctl[] = array('regex' => '#^/p/(\w+)/source/changesrev/$#',
// ---------- Downloads ------------------------------------ // ---------- Downloads ------------------------------------
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
'method' => 'index'); 'method' => 'index');
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/label/(\d+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/label/(\d+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
'method' => 'listLabel'); 'method' => 'listLabel');
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/(\d+)/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/(\d+)/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
'method' => 'view'); 'method' => 'view');
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/(\d+)/get/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/(\d+)/get/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
'method' => 'download'); 'method' => 'download');
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/create/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/create/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
'method' => 'submit'); 'method' => 'submit');
$ctl[] = array('regex' => '#^/p/(\w+)/downloads/(\d+)/delete/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/downloads/(\d+)/delete/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Download', 'model' => 'IDF_Views_Download',
@ -224,37 +224,37 @@ $ctl[] = array('regex' => '#^/p/(\w+)/downloads/(\d+)/delete/$#',
// ---------- ADMIN -------------------------------------- // ---------- ADMIN --------------------------------------
$ctl[] = array('regex' => '#^/p/(\w+)/admin/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'admin'); 'method' => 'admin');
$ctl[] = array('regex' => '#^/p/(\w+)/admin/issues/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/issues/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'adminIssues'); 'method' => 'adminIssues');
$ctl[] = array('regex' => '#^/p/(\w+)/admin/downloads/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/downloads/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'adminDownloads'); 'method' => 'adminDownloads');
$ctl[] = array('regex' => '#^/p/(\w+)/admin/source/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/source/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'adminSource'); 'method' => 'adminSource');
$ctl[] = array('regex' => '#^/p/(\w+)/admin/members/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/members/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',
'method' => 'adminMembers'); 'method' => 'adminMembers');
$ctl[] = array('regex' => '#^/p/(\w+)/admin/tabs/$#', $ctl[] = array('regex' => '#^/p/([\-\w]+)/admin/tabs/$#',
'base' => $base, 'base' => $base,
'priority' => 4, 'priority' => 4,
'model' => 'IDF_Views_Project', 'model' => 'IDF_Views_Project',