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

* Code for function update refactors .

Browse Source
This commit is contained in:
guofeilong
2023-05-08 14:04:55 +08:00
parent 71eb93b227
commit 9d7755d855
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+4 -4
View File
@@ -1367,7 +1367,7 @@ class projectModel extends model
* @access public
* @return bool
*/
public function updateWhitelistByProject(int $projectID, object $project, object $oldProject): bool
public function updateWhitelistByProject(int $projectID, object $project, object $oldProject, array $linkedProducts): bool
{
/* Check if whitelist shoud update .*/
$whitelist = array_filter(explode(',', $project->whitelist));
@@ -1422,8 +1422,8 @@ class projectModel extends model
{
/* Activate or close the shadow product of the project. */
$productID = $this->loadModel('product')->getProductIDByProject($projectID);
if($project->status == 'doing') $this->product->activate($productID);
if($project->status == 'closed') $this->product->close($productID);
if($status == 'doing') $this->product->activate($productID);
if($status == 'closed') $this->product->close($productID);
return !dao::isError();
}
@@ -1514,7 +1514,7 @@ class projectModel extends model
$this->updateProducts($projectID, $project->product); // 更新关联的项目列表。
$this->unLinkProductsByProject($projectID, $project, $oldProject); // 解除关联部分关联的产品信息。
$this->updateUserViewByProject($projectID, $project->acl); // 更新用户视图。
$this->updateWhitelistByProject($projectID, $project, $oldProject); // 更新关联的白名单列表。
$this->updateWhitelistByProject($projectID, $project, $oldProject, $linkedProducts); // 更新关联的白名单列表。
$this->updateTeamMembersByProject($projectID, $project, $oldProject); // 更新关联的成员列表。
$this->file->updateObjectID($this->post->uid, $projectID, 'project'); // 通过uid更新文件id。
module/project/tao.php
+2 -1
View File
@@ -106,6 +106,8 @@ class projectTao extends projectModel
*/
protected function doUpdate(int $projectID ,object $project, object $oldProject): bool
{
$project = $project -> remove('auth,product,products,branch,plans,delta,future,contactListMenu,teamMembers');
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck('begin,end')
->batchcheck($requiredFields, 'notempty')
@@ -116,7 +118,6 @@ class projectTao extends projectModel
->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type` = 'project' and `model` = '{$project->model}' and `deleted` = '0'")
->checkFlow()
->where('id')->eq($projectID)
->remove('products,branch,plans,delta,future,contactListMenu,teamMembers')
->exec();
return !dao::isError();