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

Merge branch feature/workflowgroup of zentao/zentaopms (#11687)

Browse Source
This commit is contained in:
刘刚
2025-09-26 14:19:53 +08:00
committed by Gitfox
parent fbc45e88e4 4639a0090c
commit 50fa8d825d
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+4
View File
@@ -1377,6 +1377,10 @@ class actionModel extends model
{
$action->objectLink = helper::createLink('project', 'deliverable', "projectID={$action->objectID}"); // 交付物链接
}
elseif($action->objectType == 'execution' && $action->action == 'managedeliverable')
{
$action->objectLink = helper::createLink('execution', 'view', "executionID={$action->objectID}"); // 交付物链接
}
}
return $actions;
}
module/project/config.php
+1 -1
View File
@@ -41,7 +41,7 @@ $config->project->labelClass['kanban'] = 'secondary-outline';
$config->project->labelClass['agileplus'] = 'secondary-outline';
$config->project->labelClass['waterfallplus'] = 'secondary-outline';
$config->project->multiple['project'] = ',qa,devops,doc,build,release,dynamic,settings,';
$config->project->multiple['project'] = ',qa,devops,review,doc,build,release,dynamic,settings,';
$config->project->multiple['execution'] = ',task,kanban,burn,view,story,CFD,';
$config->project->checkList = new stdclass();
module/upgrade/model.php
+7 -3
View File
@@ -12234,8 +12234,6 @@ class upgradeModel extends model
$doc->addedBy = 'system';
$doc->addedDate = helper::now();
$docContent = new stdclass();
$docContent->type = 'doc';
foreach($reviews as $review)
{
if(!isset($projectDeliverables[$review->project][$review->category])) continue;
@@ -12261,8 +12259,9 @@ class upgradeModel extends model
$this->dao->insert(TABLE_DOC)->data($doc)->exec();
$review->doc = $this->dao->lastInsertID();
$review->docVersion = 1;
$this->dao->update(TABLE_REVIEW)->set('doc')->eq($review->doc)->where('id')->eq($review->id)->exec();
$docContent = new stdclass();
$docContent->type = 'doc';
$docContent->doc = $review->doc;
$docContent->title = $review->title;
$docContent->files = $files;
@@ -12284,6 +12283,7 @@ class upgradeModel extends model
$this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec();
$this->dao->update(TABLE_FILE)->set('objectType')->eq('doc')->set('objectID')->eq($review->doc)->where('id')->in($files)->exec();
$this->dao->update(TABLE_DOC)->set('version')->eq($review->docVersion)->where('id')->eq($review->doc)->exec();
$this->dao->update(TABLE_REVIEW)->set('docVersion')->eq($review->docVersion)->where('id')->eq($review->id)->exec();
}
$deliverable = new stdclass();
@@ -12310,6 +12310,10 @@ class upgradeModel extends model
$this->dao->insert(TABLE_PROJECTDELIVERABLE)->data($deliverable)->exec();
$deliverableID = $this->dao->lastInsertID();
}
else
{
$this->dao->update(TABLE_PROJECTDELIVERABLE)->set('docVersion')->eq($deliverable->docVersion)->set('review')->eq($deliverable->review)->where('id')->eq($deliverableID)->exec();
}
$this->dao->update(TABLE_REVIEW)->set('deliverable')->eq($deliverableID)->set('title')->eq($deliverable->name)->where('id')->eq($review->id)->exec();
$this->dao->update(TABLE_OBJECT)->set('category')->eq($deliverable->deliverable)->where('id')->eq($review->object)->exec(); // 将评审对象改成交付物ID