natalie
/
indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed to handle exception nicely instead of crashing the view.

dev
Loic d'Anterroches 2008-11-23 21:09:44 +01:00
parent 4260a083be
commit bebce1812d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/IDF/Views/Source.php
View File

@ -118,20 +118,17 @@ class IDF_Views_Source
$branches = $scm->getBranches(); $branches = $scm->getBranches();
$commit = $match[2]; $commit = $match[2];
$request_file = $match[3]; $request_file = $match[3];
$fburl = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase',
array($request->project->shortname,
$branches[0]));
if ('commit' != $scm->testHash($commit, $request_file)) { if ('commit' != $scm->testHash($commit, $request_file)) {
// Redirect to the first branch // Redirect to the first branch
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase', return new Pluf_HTTP_Response_Redirect($fburl);
array($request->project->shortname,
$branches[0]));
return new Pluf_HTTP_Response_Redirect($url);
} }
$request_file_info = $scm->getFileInfo($request_file, $commit); $request_file_info = $scm->getFileInfo($request_file, $commit);
if (!$request_file_info) { if (!$request_file_info) {
// Redirect to the first branch // Redirect to the first branch
$url = Pluf_HTTP_URL_urlForView('IDF_Views_Source::treeBase', return new Pluf_HTTP_Response_Redirect($fburl);
array($request->project->shortname,
$branches[0]));
return new Pluf_HTTP_Response_Redirect($url);
} }
if ($request_file_info->type != 'tree') { if ($request_file_info->type != 'tree') {
$info = self::getMimeType($request_file_info->file); $info = self::getMimeType($request_file_info->file);
@ -155,7 +152,11 @@ class IDF_Views_Source
$page_title = $bc.' - '.$title; $page_title = $bc.' - '.$title;
$cobject = $scm->getCommit($commit); $cobject = $scm->getCommit($commit);
$tree_in = in_array($commit, $branches); $tree_in = in_array($commit, $branches);
$res = new Pluf_Template_ContextVars($scm->filesAtCommit($commit, $request_file)); try {
$res = new Pluf_Template_ContextVars($scm->filesAtCommit($commit, $request_file));
} catch (Exception $e) {
return new Pluf_HTTP_Response_Redirect($fburl);
}
// try to find the previous level if it exists. // try to find the previous level if it exists.
$prev = split('/', $request_file); $prev = split('/', $request_file);
$l = array_pop($prev); $l = array_pop($prev);