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

* Fix bug 27892 - activate or close the shadow product of a project.

Browse Source
This commit is contained in:
liugang
2022-10-08 15:45:31 +08:00
parent f0aec63a7c
commit ce0b20e2ef
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+32 -6
View File
@@ -1568,6 +1568,14 @@ class projectModel extends model
$oldProject->linkedProducts = implode(',', $linkedProducts);
$project->linkedProducts = implode(',', $_POST['products']);
/* Activate or close the shadow product of the project. */
if(!$oldProject->hasProduct && $oldProject->status != $project->status && strpos('doing,closed', $project->status) !== false)
{
$productID = $this->loadModel('product')->getProductIDByProject($projectID);
if($project->status == 'doing') $this->product->activate($productID);
if($project->status == 'closed') $this->product->close($productID);
}
return common::createChanges($oldProject, $project);
}
}
@@ -1803,6 +1811,8 @@ class projectModel extends model
->where('id')->eq((int)$projectID)
->exec();
if(dao::isError()) return false;
/* Readjust task. */
if($this->post->readjustTime and $this->post->readjustTask)
{
@@ -1838,7 +1848,14 @@ class projectModel extends model
}
}
if(!dao::isError()) return common::createChanges($oldProject, $project);
/* Activate the shadow product of the project. */
if(!$oldProject->hasProduct)
{
$productID = $this->loadModel('product')->getProductIDByProject($projectID);
$this->product->activate($productID);
}
return common::createChanges($oldProject, $project);
}
/**
@@ -1881,13 +1898,22 @@ class projectModel extends model
->exec();
/* When it has multiple errors, only the first one is prompted */
if(dao::isError() and count(dao::$errors['realEnd']) > 1) dao::$errors['realEnd'] = dao::$errors['realEnd'][0];
if(!dao::isError())
if(dao::isError())
{
$this->loadModel('score')->create('project', 'close', $oldProject);
return common::createChanges($oldProject, $project);
if(count(dao::$errors['realEnd']) > 1) dao::$errors['realEnd'] = dao::$errors['realEnd'][0];
return false;
}
/* Close the shadow product of the project. */
if(!$oldProject->hasProduct)
{
$productID = $this->loadModel('product')->getProductIDByProject($projectID);
$this->product->close($productID);
}
$this->loadModel('score')->create('project', 'close', $oldProject);
return common::createChanges($oldProject, $project);
}
/**