diff --git a/module/project/ui/build.html.php b/module/project/ui/build.html.php index bf26a72bb6..31479b6572 100644 --- a/module/project/ui/build.html.php +++ b/module/project/ui/build.html.php @@ -29,6 +29,8 @@ featureBar ( set::current($type), set::linkParams("projectID={$project->id}&type={key}¶m={$param}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), + set::module('project'), + set::method('build'), $changeProductBox, li(searchToggle(set::module('projectBuild'))), ); @@ -43,8 +45,8 @@ toolbar jsVar('orderBy', $orderBy); jsVar('projectID', $project->id); -jsVar('sortLink', helper::createLink('project', 'build', "projectID={$project->id}&type={$type}¶m={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); -jsVar('changeProductLink', helper::createLink('project', 'build', "projectID={$project->id}&type=product¶m={productID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); +jsVar('sortLink', helper::createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type={$type}¶m={$param}&orderBy={orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); +jsVar('changeProductLink', helper::createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type=product¶m={productID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")); jsVar('scmPathTip', $lang->build->scmPath); jsVar('filePathTip', $lang->build->filePath); jsVar('confirmDelete', $lang->build->confirmDelete); @@ -61,7 +63,7 @@ dtable usePager(), set::recPerPage($pager->recPerPage), set::recTotal($pager->recTotal), - set::linkCreator(helper::createLink('project', 'build', "projectID={$project->id}&type={$type}¶m={$param}&orderBy={$orderBy}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={pageID}")), + set::linkCreator(helper::createLink($app->rawModule, $app->rawMethod, "projectID={$project->id}&type={$type}¶m={$param}&orderBy={$orderBy}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={pageID}")), ), ); diff --git a/module/projectbuild/control.php b/module/projectbuild/control.php index f758cb776c..772aca0e24 100644 --- a/module/projectbuild/control.php +++ b/module/projectbuild/control.php @@ -16,12 +16,16 @@ class projectBuild extends control * @param int $projectID * @param string $type all|product|bysearch * @param int $param + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function browse($projectID = 0, $type = 'all', $param = 0, $orderBy = 't1.date_desc,t1.id_desc') + public function browse($projectID = 0, $type = 'all', $param = 0, $orderBy = 't1.date_desc,t1.id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { - echo $this->fetch('project', 'build', "projectID=$projectID&type=$type¶m=$param&orderBy=$orderBy"); + echo $this->fetch('project', 'build', "projectID={$projectID}&type={$type}¶m={$param}&orderBy={$orderBy}&recTotal={$recTotal}&recPerPage={$recPerPage}&pageID={$pageID}"); } /**