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

This commit is contained in:
刘刚
2025-12-05 08:36:14 +08:00
committed by Gitfox
2 changed files with 1 additions and 4 deletions
-3
View File
@@ -120,9 +120,6 @@ INSERT INTO `zt_metric` (`purpose`, `scope`, `object`, `stage`, `type`, `name`,
ALTER TABLE `zt_approvalnode` CHANGE `result` `result` varchar(20) NOT NULL DEFAULT '';
DELETE FROM `zt_workflowgroup` WHERE `projectModel` = 'kanban';
UPDATE `zt_project` SET `workflowGroup` = '0' WHERE `model` = 'kanban';
CREATE TABLE IF NOT EXISTS `zt_decision` (
`id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
`workflowGroup` mediumint(8) unsigned NOT NULL DEFAULT '0',
+1 -1
View File
@@ -272,7 +272,7 @@ row
(
setClass('flex mt-4 program'),
$programDom ? div(setClass('clip programBox w-1/2'), $programDom) : null,
$config->edition != 'open' && !empty($project->workflowGroup) && $project->model != 'kanban' ? div
$config->edition != 'open' && !empty($project->workflowGroup) ? div
(
setClass('clip w-1/2'),
set::title($lang->project->workflowGroup),