From 71bb2181abeeba38a616c720b73f288d2b57fe1d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 29 Jul 2015 10:26:04 +0800 Subject: [PATCH] * fix bug #728. --- module/bug/view/view.html.php | 41 ++++++++++++++++++------------ module/report/css/common.css | 1 + module/story/view/view.html.php | 15 ++++++++--- module/task/view/view.html.php | 45 +++++++++++++++++++++------------ 4 files changed, 67 insertions(+), 35 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index ad701c741c..04813a1557 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -98,22 +98,31 @@ bug->module;?> - - $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; - } - } - ?> - + $module) + { + $moduleTitle .= $module->name; + if(!common::printLink('bug', 'browse', "productID=$bug->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; + if(isset($modulePath[$key + 1])) + { + $moduleTitle .= '/'; + echo $lang->arrow; + } + } + } + $printModule = ob_get_contents(); + ob_end_clean(); + ?> + bug->productplan;?> diff --git a/module/report/css/common.css b/module/report/css/common.css index 3559b5a9d1..e034db52d1 100644 --- a/module/report/css/common.css +++ b/module/report/css/common.css @@ -5,6 +5,7 @@ ul li{list-style:none;} #product p{margin:2px 0;} +#titlebar{display:none;} .table-bordered, .outer.with-side .main, .outer.with-side > form > .table, .outer.with-side > .table{border: none} #report-list.list-group {margin-bottom: 0;} diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php index 1202c64bbd..499b82703f 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -112,22 +112,31 @@ story->module;?> - $module) { + $moduleTitle .= $module->name; if(!common::printLink('product', 'browse', "productID=$story->product&browseType=byModule¶m=$module->id", $module->name)) echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; + if(isset($modulePath[$key + 1])) + { + $moduleTitle .= '/'; + echo $lang->arrow; + } } } + $printModule = ob_get_contents(); + ob_end_clean(); ?> - + story->plan;?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index eb04ce563e..564978a0c4 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -98,23 +98,36 @@ task->module;?> - - name . $lang->arrow; - foreach($modulePath as $key => $module) - { + name . '/'; + echo $product->name . $lang->arrow; + } + foreach($modulePath as $key => $module) + { + $moduleTitle .= $module->name; 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; - } - } - ?> - + if(isset($modulePath[$key + 1])) + { + $moduleTitle .= '/'; + echo $lang->arrow; + } + } + } + $printModule = ob_get_contents(); + ob_end_clean(); + ?> + task->story;?>