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

* Adjust linked products issues when creating independent projects.

Browse Source
This commit is contained in:
tianshujie98
2020-12-10 13:24:16 +08:00
parent cf38a216e6
commit 2452239690
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
+12 -15
View File
@@ -1187,7 +1187,7 @@ class programModel extends model
* Create a project.
*
* @access public
* @return void
* @return int
*/
public function PRJCreate()
{
@@ -1206,6 +1206,15 @@ class programModel extends model
->remove('products,branch,plans,delta,newProduct,productName')
->get();
$linkedProductsCount = 0;
if(isset($_POST['products']))
{
foreach($_POST['products'] as $product)
{
if(!empty($product)) $linkedProductsCount++;
}
}
if($project->parent)
{
$parentProgram = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($project->parent)->fetch();
@@ -1221,15 +1230,6 @@ class programModel extends model
}
/* Judge products not empty. */
$linkedProductsCount = 0;
if(isset($_POST['products']))
{
foreach($_POST['products'] as $product)
{
if(!empty($product)) $linkedProductsCount++;
}
}
if(empty($linkedProductsCount) and !isset($_POST['newProduct']))
{
dao::$errors[] = $this->lang->program->productNotEmpty;
@@ -1271,12 +1271,9 @@ class programModel extends model
$this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
if($project->acl != 'open') $this->loadModel('user')->updateUserView($projectID, 'project');
if($project->parent)
{
$this->loadModel('project')->updateProducts($projectID);
}
$this->loadModel('project')->updateProducts($projectID);
if(isset($_POST['newProduct']) || !$project->parent)
if(isset($_POST['newProduct']) || (!$project->parent && empty($linkedProductsCount)))
{
/* If parent not empty, link products or create products. */
$product = new stdclass();