diff --git a/module/execution/ui/bug.html.php b/module/execution/ui/bug.html.php index aefb27d28f..8330f73100 100644 --- a/module/execution/ui/bug.html.php +++ b/module/execution/ui/bug.html.php @@ -14,7 +14,7 @@ namespace zin; featureBar ( set::current($type), - set::linkParams("executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy=status,id_desc&build={$buildID}&type={key}¶m=$param"), + set::linkParams("executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy={$orderBy}&build={$buildID}&type={key}¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"), li(searchToggle(set::module('bug'))) ); diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index 3454d050c3..9480a80d31 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -16,7 +16,7 @@ namespace zin; featureBar ( set::current($browseType), - set::linkParams("executionID={$execution->id}&status={key}"), + set::linkParams("executionID={$execution->id}&status={key}¶m={$param}&orderBy={$orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}"), li(searchToggle(set::module('task'))) ); diff --git a/module/execution/ui/testcase.html.php b/module/execution/ui/testcase.html.php index 5b6e622333..ce1721dc35 100644 --- a/module/execution/ui/testcase.html.php +++ b/module/execution/ui/testcase.html.php @@ -14,13 +14,13 @@ namespace zin; featureBar ( set::current($type), - set::linkParams("executionID=$executionID&productID=$productID&branchID=$branchID&type=$type&moduleID=$moduleID&orderBy=$orderBy"), + set::linkParams("executionID={$executionID}&productID={$productID}&branchID={$branchID}&type={key}&moduleID={$moduleID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), li(searchToggle(set::module('testcase'))) ); /* zin: Define the toolbar on main menu. */ $canCreateTestcase = hasPriv('testcase', 'create') && common::canModify('execution', $execution); -if($canCreateTestcase) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->testcase->create, 'url' => $this->createLink('testcase', 'create', "productID=$productID&branch=0&moduleID=0&from=execution¶m=$execution->id")); +if($canCreateTestcase) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->testcase->create, 'url' => $this->createLink('testcase', 'create', "productID={$productID}&branch=0&moduleID=0&from=execution¶m={$execution->id}")); toolbar ( !empty($createItem) ? item(set($createItem)) : null, @@ -56,4 +56,3 @@ dtable ); render(); - diff --git a/module/release/ui/browse.html.php b/module/release/ui/browse.html.php index 42555b88df..0d3587c30c 100644 --- a/module/release/ui/browse.html.php +++ b/module/release/ui/browse.html.php @@ -13,7 +13,7 @@ namespace zin; featureBar ( set::current($type), - set::linkParams("productID={$product->id}&branch={$branch}&type={key}"), + set::linkParams("productID={$product->id}&branch={$branch}&type={key}&orderBy={$orderBy}¶m=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), li(searchToggle(set::module('release'))) );