From 09acfbbc531dc7a10f661944033155d29d8e9757 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 28 Apr 2021 11:00:28 +0800 Subject: [PATCH] * Modify the project doc lib acl when the project acl is program. --- module/project/model.php | 2 +- module/upgrade/model.php | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/module/project/model.php b/module/project/model.php index a078124118..3b5b3a0d57 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -748,7 +748,7 @@ class projectModel extends model $lib->name = $this->lang->doclib->main['project']; $lib->type = 'project'; $lib->main = '1'; - $lib->acl = $project->acl; + $lib->acl = $project->acl != 'program' ? $project->acl : 'custom'; $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec(); $this->updateProducts($projectID); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index c02e3b4791..cefc175566 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -647,6 +647,10 @@ class upgradeModel extends model $this->saveLogs('Execute 15_0_rc2'); $this->execSQL($this->getUpgradeFile('15.0.rc2')); $this->appendExec('15_0_rc2'); + case '15_0_rc3': + $this->saveLogs('Execute 15_0_rc3'); + $this->updateLibType(); + $this->appendExec('15_0_rc3'); } $this->deletePatch(); @@ -4304,7 +4308,7 @@ class upgradeModel extends model $lib->name = $this->lang->doclib->main['project']; $lib->type = 'project'; $lib->main = '1'; - $lib->acl = $project->acl; + $lib->acl = $project->acl != 'program' ? $project->acl : 'custom'; $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec(); $this->loadModel('action')->create('project', $projectID, 'openedbysystem'); @@ -4863,4 +4867,18 @@ class upgradeModel extends model return true; } + + /** + * Update execution main doclib type. + * + * @access public + * @return bool + */ + public function updateLibType() + { + $executionList = $this->dao->select('id')->from(TABLE_EXECUTION)->where('type')->eq('sprint')->fetchAll('id'); + $this->dao->update(TABLE_DOCLIB)->set('type')->eq('execution')->where('execution')->in(array_keys($executionList))->exec(); + + return true; + } }