diff --git a/lib/zin/wg/main/v1.php b/lib/zin/wg/main/v1.php index 5c116596f3..5814267dec 100644 --- a/lib/zin/wg/main/v1.php +++ b/lib/zin/wg/main/v1.php @@ -45,7 +45,7 @@ class main extends wg protected function buildMenu(): wg { $menuBlocks = $this->block('menu'); - if(empty($menuBlocks)) return null; + if(empty($menuBlocks)) return div(); list($featureBarList, $navList, $toolbarList, $restList) = groupWgInList($menuBlocks, array('featureBar', 'nav', 'toolbar')); diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index 90e969ab9e..2d2c61a231 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -11,5 +11,5 @@ */ ?> -fetch('block', 'dashboard', 'module=doc');?> +fetch('block', 'dashboard', 'dashboard=doc');?> diff --git a/module/execution/view/index.html.php b/module/execution/view/index.html.php index 754c687d15..3f634f2208 100644 --- a/module/execution/view/index.html.php +++ b/module/execution/view/index.html.php @@ -15,6 +15,6 @@

execution->noProject;?> " . $lang->execution->create, '', "class='btn btn-info'");?>

-fetch('block', 'dashboard', 'module=execution');?> +fetch('block', 'dashboard', 'dashboard=execution');?> diff --git a/module/my/control.php b/module/my/control.php index f1b65a6575..79e00a5c5b 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -33,7 +33,7 @@ class my extends control public function index() { $this->view->title = $this->lang->my->common; - echo $this->fetch('block', 'dashboard', 'module=my'); + echo $this->fetch('block', 'dashboard', 'dashboard=my'); } /** diff --git a/module/product/view/index.html.php b/module/product/view/index.html.php index 0623e224a3..e998577419 100644 --- a/module/product/view/index.html.php +++ b/module/product/view/index.html.php @@ -16,6 +16,6 @@

product->noProduct;?> " . $lang->product->create, '', "class='btn btn-info'");?>

-fetch('block', 'dashboard', 'module=product');?> +fetch('block', 'dashboard', 'dashboard=product');?> diff --git a/module/qa/view/index.html.php b/module/qa/view/index.html.php index 0af2542ca0..625e9c9770 100644 --- a/module/qa/view/index.html.php +++ b/module/qa/view/index.html.php @@ -11,5 +11,5 @@ */ ?> -fetch('block', 'dashboard', 'module=qa');?> +fetch('block', 'dashboard', 'dashboard=qa');?> diff --git a/module/testtask/config/table.php b/module/testtask/config/table.php index 0d670908f0..9148cefd4d 100644 --- a/module/testtask/config/table.php +++ b/module/testtask/config/table.php @@ -38,7 +38,7 @@ $config->testtask->actionList['linkCase']['url'] = helper::createLink('testtask $config->testtask->actionList['report']['icon'] = 'summary'; $config->testtask->actionList['report']['text'] = $lang->testtask->testreport; $config->testtask->actionList['report']['hint'] = $lang->testtask->testreport; -$config->testtask->actionList['report']['url'] = helper::createLink('testreport', 'browse', 'objectID={product}&objectType=product&extra={id}'); +$config->testtask->actionList['report']['url'] = array('module' => 'testreport', 'method' => 'browse', 'params' => 'objectID={product}&objectType=product&extra={id}'); $config->testtask->actionList['view']['icon'] = 'list-alt'; $config->testtask->actionList['view']['text'] = $lang->testtask->view;