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

Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
jukui
2023-05-05 10:11:31 +08:00
parent d0075f617c 50687f1555
commit 9463e9ab29
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+2 -4
View File
@@ -1213,10 +1213,8 @@ class product extends control
{
return printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project');
}
else
{
return print(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
}
return print(html::select('product', $products, '', "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
}
/**
module/product/model.php
+2 -2
View File
@@ -1315,7 +1315,7 @@ class productModel extends model
{
if(in_array($project->model, array('waterfall', 'waterfallplus'))) $hasWaterfall = true;
}
$orderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
$waterFallOrderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
$executions = $this->dao->select('t2.id,t2.name,t2.project,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
@@ -1328,7 +1328,7 @@ class productModel extends model
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t2.status')->ne('closed')->fi()
->beginIF(strpos($mode, 'multiple') !== false)->andWhere('t2.multiple')->eq('1')->fi()
->andWhere('t2.deleted')->eq('0')
->orderBy($orderBy)
->orderBy($waterFallOrderBy)
->fetchAll('id');
/* Only show leaf executions. */
module/product/zen.php
+4 -4
View File
@@ -79,9 +79,9 @@ class productZen extends product
{
if($this->app->getViewType() == 'mhtml') return $this->product->setMenu();
if($moduleName == 'qa') return $this->setShowErrorNoneMenu4QA($activeMenu);
if($moduleName == 'project') return $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
if($moduleName == 'execution') return $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
if($moduleName == 'qa') $this->setShowErrorNoneMenu4QA($activeMenu);
if($moduleName == 'project') $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
if($moduleName == 'execution') $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
}
/**
@@ -401,7 +401,7 @@ class productZen extends product
$message = $this->executeHooks($productID);
if($message) $this->lang->saveSuccess = $message;
return $this->sendCreateLocate($productID, $programID);
$this->sendCreateLocate($productID, $programID);
}
/**