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

code meeting fix

Browse Source
This commit is contained in:
lanzongjun
2022-12-01 08:29:35 +08:00
parent d704662eca
commit 65fe5985a2
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+8 -8
View File
@@ -1646,17 +1646,17 @@ class execution extends control
else
{
$executionProductList = $this->loadModel('product')->getProducts($executionID);
$hasMultiBranchProduct = false;
$multiBranchProduct = false;
foreach($executionProductList as $executionProduct)
{
if($executionProduct->type != 'normal')
{
$hasMultiBranchProduct = true;
$multiBranchProduct = true;
break;
}
}
$importPlanStoryTips = $hasMultiBranchProduct ? $this->lang->execution->importBranchPlanStory : $this->lang->execution->importPlanStory;
$importPlanStoryTips = $multiBranchProduct ? $this->lang->execution->importBranchPlanStory : $this->lang->execution->importPlanStory;
return print(js::confirm($importPlanStoryTips, inlink('create', "projectID=$projectID&executionID=$executionID&copyExecutionID=&planID=$planID&confirm=yes"), inlink('create', "projectID=$projectID&executionID=$executionID")));
}
@@ -1918,17 +1918,17 @@ class execution extends control
elseif(!empty($newPlans))
{
$executionProductList = $this->loadModel('product')->getProducts($executionID);
$hasMultiBranchProduct = false;
$multiBranchProduct = false;
foreach($executionProductList as $executionProduct)
{
if($executionProduct->type != 'normal')
{
$hasMultiBranchProduct = true;
$multiBranchProduct = true;
break;
}
}
$importEditPlanStoryTips = $hasMultiBranchProduct ? $this->lang->execution->importBranchEditPlanStory : $this->lang->execution->importEditPlanStory;
$importEditPlanStoryTips = $multiBranchProduct ? $this->lang->execution->importBranchEditPlanStory : $this->lang->execution->importEditPlanStory;
return print(js::confirm($importEditPlanStoryTips, inlink('edit', "executionID=$executionID&action=edit&extra=&newPlans=$newPlans&confirm=yes"), inlink('view', "executionID=$executionID")));
}
@@ -4151,8 +4151,8 @@ class execution extends control
foreach($planStory as $id => $story)
{
$projectProducts = zget($projectProducts, $story->product, array());
if($story->status == 'draft' or $story->status == 'reviewing' or (!empty($projectProducts) and !isset($projectProducts[$story->branch])))
$projectBranches = zget($projectProducts, $story->product, array());
if($story->status == 'draft' or $story->status == 'reviewing' or (!empty($projectBranches) and !isset($projectBranches[$story->branch])))
{
$count++;
unset($planStory[$id]);