From b1bde8cac5224fc251a54058cc2052778d285e33 Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Mon, 29 Oct 2012 07:34:36 +0000 Subject: [PATCH] * fix bug#332. --- module/bug/view/view.html.php | 13 ++++++++++--- module/doc/view/view.html.php | 2 +- module/task/view/view.html.php | 13 ++++++++++--- module/testcase/view/view.html.php | 21 ++++++++++++++------- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index 0655094f01..c62e3e8085 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -83,10 +83,17 @@ bug->module;?> $module) + if(empty($modulePath)) { - if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; + echo "/"; + } + else + { + foreach($modulePath as $key => $module) + { + if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; + if(isset($modulePath[$key + 1])) echo $lang->arrow; + } } ?> diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php index 5279eb5dde..9793ce5014 100644 --- a/module/doc/view/view.html.php +++ b/module/doc/view/view.html.php @@ -23,7 +23,7 @@ doc->module;?> - moduleName;?> + moduleName ? $doc->moduleName : '/';?> doc->type;?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index dc9ee6e167..81efcc6caf 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -83,10 +83,17 @@ task->module;?> $module) + if(empty($modulePath)) { - if(!common::printLink('project', 'task', "projectID=$task->project&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; + echo "/"; + } + else + { + foreach($modulePath as $key => $module) + { + if(!common::printLink('project', 'task', "projectID=$task->project&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; + if(isset($modulePath[$key + 1])) echo $lang->arrow; + } } ?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 2b52844aa7..3ce4424ef8 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -95,13 +95,20 @@ testcase->module;?> - $module) - { - if(!common::printLink('testcase', 'browse', "productID=$case->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; - } -?> + $module) + { + if(!common::printLink('testcase', 'browse', "productID=$case->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; + if(isset($modulePath[$key + 1])) echo $lang->arrow; + } + } + ?>