From 3836cbf8045138f8f63c8ae21ba0c24dfb633d39 Mon Sep 17 00:00:00 2001 From: liugang Date: Wed, 8 Nov 2023 14:02:40 +0800 Subject: [PATCH] * execution: add emptyTip, createTip and createLink attributes to dtable. --- module/execution/ui/bug.html.php | 3 +++ module/execution/ui/testcase.html.php | 3 +++ module/execution/ui/testtask.html.php | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/module/execution/ui/bug.html.php b/module/execution/ui/bug.html.php index fc1dd24402..1a34ac1a37 100644 --- a/module/execution/ui/bug.html.php +++ b/module/execution/ui/bug.html.php @@ -99,6 +99,9 @@ dtable set::footPager( usePager(array('linkCreator' => helper::createLink('execution', 'bug', "executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy={$orderBy}&build=$buildID&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={recPerPage}&pageID={page}"))), ), + set::emptyTip($lang->bug->notice->noBug), + set::createTip($lang->bug->create), + set::createLink($canCreateBug ? createLink('bug', 'create', "productID={$defaultProduct}&branch=0&extras=executionID={$execution->id}") : ''), set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')) ); render(); diff --git a/module/execution/ui/testcase.html.php b/module/execution/ui/testcase.html.php index 2e5daad213..af08c27313 100644 --- a/module/execution/ui/testcase.html.php +++ b/module/execution/ui/testcase.html.php @@ -66,6 +66,9 @@ dtable set::footPager( usePager(array('linkCreator' => helper::createLink('execution', 'testcase', "executionID={$executionID}&productID={$productID}&branchID={$branchID}&type={$type}¶m=0&moduleID={$moduleID}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&pageID={page}"))), ), + set::emptyTip($lang->testcase->noCase), + set::createTip($lang->testcase->create), + set::createLink($canCreateTestcase ? createLink('testcase', 'create', "productID={$productID}&branch=0&moduleID=0&from=execution¶m={$execution->id}") : '') ); render(); diff --git a/module/execution/ui/testtask.html.php b/module/execution/ui/testtask.html.php index b14edcad85..7dc98566d9 100644 --- a/module/execution/ui/testtask.html.php +++ b/module/execution/ui/testtask.html.php @@ -27,9 +27,11 @@ featureBar ) ); +$canCreate = $canBeChanged && hasPriv('testtask', 'create'); + toolbar ( - $canBeChanged && common::hasPriv('testtask', 'create') ? btn + $canCreate ? btn ( setClass('btn primary'), set::icon('plus'), @@ -68,4 +70,7 @@ dtable 'linkCreator' => helper::createLink('execution', 'testtask', "executionID={$execution->id}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}") ))), set::checkInfo(jsRaw('function(checkedIDList){return window.setStatistics(this, checkedIDList);}')), + set::emptyTip($lang->testtask->noTesttask), + set::createTip($lang->testtask->create), + set::createLink($canCreate ? createLink('testtask', 'create', "product=0&executionID=$executionID&build=0&projectID=$execution->project") : '') );