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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-06-01 10:53:53 +08:00
parent 9fb469a9ac cf907e8325
commit fae8fb6bb0
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+9 -8
View File
@@ -758,14 +758,15 @@ class projectModel extends model
{
/* If parent not empty, link products or create products. */
$product = new stdclass();
$product->name = $this->post->productName ? $this->post->productName : $project->name;
$product->bind = $this->post->parent ? 0 : 1;
$product->program = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
$product->acl = $project->acl = 'open' ? 'open' : 'private';
$product->PO = $project->PM;
$product->createdBy = $this->app->user->account;
$product->createdDate = helper::now();
$product->status = 'normal';
$product->name = $this->post->productName ? $this->post->productName : $project->name;
$product->bind = $this->post->parent ? 0 : 1;
$product->program = $project->parent ? current(array_filter(explode(',', $program->path))) : 0;
$product->acl = $project->acl = 'open' ? 'open' : 'private';
$product->PO = $project->PM;
$product->createdBy = $this->app->user->account;
$product->createdDate = helper::now();
$product->status = 'normal';
$product->createdVersion = $this->config->version;
$this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
$productID = $this->dao->lastInsertId();
module/upgrade/model.php
+24 -7
View File
@@ -676,6 +676,10 @@ class upgradeModel extends model
$this->adjustBugOfProject();
$this->processBuildTable();
$this->appendExec('15_0');
case '15_0_1':
$this->saveLogs('Execute 15_0_1');
$this->updateProductVersion();
$this->appendExec('15_0_1');
}
$this->deletePatch();
@@ -4637,13 +4641,14 @@ class upgradeModel extends model
if(isset($data->name))
{
$product = new stdclass();
$product->program = $data->program;
$product->name = $data->name;
$product->acl = 'open';
$product->PO = isset($this->app->user->account) ? $this->app->user->account : '';
$product->createdBy = isset($this->app->user->account) ? $this->app->user->account : '';
$product->createdDate = helper::now();
$product->status = 'normal';
$product->program = $data->program;
$product->name = $data->name;
$product->acl = 'open';
$product->PO = isset($this->app->user->account) ? $this->app->user->account : '';
$product->createdBy = isset($this->app->user->account) ? $this->app->user->account : '';
$product->createdDate = helper::now();
$product->status = 'normal';
$product->createdVersion = $this->config->version;
$this->dao->insert(TABLE_PRODUCT)->data($product)->exec();
$productID = $this->dao->lastInsertID();
@@ -4975,4 +4980,16 @@ class upgradeModel extends model
return true;
}
/**
* Update the createdVersion field of the zt_product table.
*
* @access public
* @return void
*/
public function updateProductVersion()
{
$this->dao->update(TABLE_PRODUCT)->set('createdVersion')->eq($this->config->version)->where('createdVersion')->eq('')->exec();
return true;
}
}