Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch release/21.7.7 of zentao/zentaopms (#12392)

Browse Source
This commit is contained in:
刘刚
2025-11-18 13:05:19 +08:00
committed by Gitfox
parent ed4b27cc8c 9f3dfede5a
commit 0da3506da8
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/js/testtask.ui.js
+2 -1
View File
@@ -39,8 +39,9 @@ window.setStatistics = function(element, checkedIDList)
rows.forEach((row) => {
if(checkedIDList.length == 0 || checkedIDList.includes(row.id))
{
const task = row.data;
if(row.id.includes('_')) return;
const task = row.data;
if(task.rawStatus == 'wait')
{
waitCount ++;
module/project/js/testtask.ui.js
+2 -1
View File
@@ -144,8 +144,9 @@ window.setStatistics = function(element, checkedIDList)
rows.forEach((row) => {
if(checkedIDList.length == 0 || checkedIDList.includes(row.id))
{
const task = row.data;
if(row.id.includes('_')) return;
const task = row.data;
if(task.rawStatus == 'wait')
{
waitCount ++;
module/testtask/ui/create.html.php
+2 -2
View File
@@ -30,7 +30,7 @@ formPanel
set::label($lang->testtask->product),
set::className(!isset($executionID) || !empty($product->shadow) ? 'hidden' : ''),
set::name('product'),
set::value($product->id),
set::value($productID),
set::control('picker'),
set::items($products)
),
@@ -65,7 +65,7 @@ formPanel
a
(
setID('buildCreateLink'),
set('href', createLink('build', 'create', "executionID=$buildExecutionID&productID={$product->id}&projectID={$projectID}")),
set('href', createLink('build', 'create', "executionID=$buildExecutionID&productID={$productID}&projectID={$projectID}")),
set('data-toggle', 'modal'),
$lang->build->create
)
module/testtask/zen.php
+2 -1
View File
@@ -403,9 +403,10 @@ class testtaskZen extends testtask
/* 如果测试单所属产品在产品键值对中不存在，将其加入。*/
/* Prepare the product key-value pairs. */
$product = $this->loadModel('product')->fetchByID($productID);
if(!isset($this->products[$productID])) $this->products[$productID] = $product->name;
if(!isset($this->products[$productID]) && !empty($product)) $this->products[$productID] = $product->name;
$this->view->title = $this->products[$productID] . $this->lang->hyphen . $this->lang->testtask->create;
$this->view->productID = $productID;
$this->view->product = $product;
$this->view->executions = $productID ? $this->product->getExecutionPairsByProduct($productID, '', $projectID, 'stagefilter') : array();
$this->view->builds = $productID ? $this->loadModel('build')->getBuildPairs(array($productID), 'all', 'notrunk,withexecution', $objectID, $objectType, '', false) : array();