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

* Fix bug #42232.

Browse Source
This commit is contained in:
sunguangming
2023-12-23 13:49:11 +08:00
parent 39de16f561
commit 84dd5756e1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1
View File
@@ -1646,6 +1646,7 @@ class executionModel extends model
foreach($executions as $execution)
{
$execution->productName = isset($productList[$execution->id]) ? trim($productList[$execution->id]->productName, ',') : '';
$execution->product = $productID;
if($execution->end) $execution->end = date(DT_DATE1, strtotime($execution->end));
if(isset($executions[$execution->parent])) $executions[$execution->parent]->isParent = 1;
module/programplan/model.php
+1 -1
View File
@@ -527,7 +527,7 @@ class programplanModel extends model
/* Check weather need to set code and compute same code. */
$setCode = isset($this->config->setCode) && $this->config->setCode == 1;
$sameCodes = $setCode ? $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '') : false;
$sameCodes = $setCode ? $this->checkCodeUnique($code, isset($planIDList) ? $planIDList : '') : false;
/* Prepare the plans user inputted. Process the plan which names not empty only. */
$project = $this->loadModel('project')->getByID($projectID);