diff --git a/module/project/model.php b/module/project/model.php index 78dd92a0a3..e6d70578ea 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -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(); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index efdd6357c1..0dcad04be9 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -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; + } }