From 10e9d3a6a84e6c4487ee4add93ef0760ed98dea8 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 21 Feb 2023 07:14:49 +0000 Subject: [PATCH 1/6] * Fix bug for create execution. --- module/execution/js/common.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/execution/js/common.js b/module/execution/js/common.js index 37b32040ba..8dc5f37673 100644 --- a/module/execution/js/common.js +++ b/module/execution/js/common.js @@ -177,9 +177,6 @@ function loadBranches(product) disableSelectedProduct(); } - var branch = $('#branch' + index); - loadPlans(product, branch); - if(typeof isStage != 'undefined' && isStage == true) { $tableRow.find("select[name^='branch'] option").attr('selected', 'selected'); @@ -187,6 +184,10 @@ function loadBranches(product) $tableRow.find("div[id^='branch']").addClass('chosen-disabled'); } }); + + var branch = $('#branch' + index); + loadPlans(product, branch); + } /** From a789a412cb6379bd639285c8506fd3d36e0a3047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Tue, 21 Feb 2023 07:23:03 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0module/execution/js/commo?= =?UTF-8?q?n.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/execution/js/common.js | 1 - 1 file changed, 1 deletion(-) diff --git a/module/execution/js/common.js b/module/execution/js/common.js index 8dc5f37673..92ca8e7134 100644 --- a/module/execution/js/common.js +++ b/module/execution/js/common.js @@ -187,7 +187,6 @@ function loadBranches(product) var branch = $('#branch' + index); loadPlans(product, branch); - } /** From ffedd1ac6d41817e4c7a232f9778a5ddfd0541e6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 21 Feb 2023 07:36:49 +0000 Subject: [PATCH 3/6] * Fix bug of sql. --- db/update18.1.sql | 5 +++++ db/zentao.sql | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/db/update18.1.sql b/db/update18.1.sql index 7a9b0d9d6a..feba83e887 100644 --- a/db/update18.1.sql +++ b/db/update18.1.sql @@ -4,6 +4,7 @@ update `zt_task` set `assignedTo` = '' where `mode` = 'multi' and `status` != 'd REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'scrumClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC; REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'agileplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC; +REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) SELECT `lang`, `module`, 'waterfallplusClassify', `key`, `value`, `system`, `vision` FROM `zt_lang` WHERE `module` = 'process' and `section` = 'classify' ORDER BY id ASC; UPDATE `zt_project` AS parent INNER JOIN (select `id`,`parent`,`attribute` from `zt_project` where `parent` != 0 and `type` = 'stage') AS child ON parent.`id` = child.`parent` SET parent.`attribute`='mix' where parent.`grade`=1 and parent.`type`='stage' and parent.`attribute` != child.`attribute`; @@ -20,3 +21,7 @@ REPLACE INTO `zt_stage` (`name`,`percent`,`type`, `projectType`, `createdBy`,`cr ('发布','10','release','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), ('总结评审','5','review','waterfallplus','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'); +ALTER table `zt_reviewcl` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `category`; +UPDATE `zt_reviewcl` SET `type` = 'waterfall' WHERE `type` = ''; + +UPDATE `zt_activity` SET `order` = `id` * 5 WHERE `order` = '0'; diff --git a/db/zentao.sql b/db/zentao.sql index b7c0f371e0..cad8faf602 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -1488,6 +1488,7 @@ CREATE TABLE IF NOT EXISTS `zt_stage` ( `name` varchar(255) NOT NULL, `percent` varchar(255) NOT NULL, `type` varchar(255) NOT NULL, + `projectType` varchar(255) NOT NULL, `createdBy` varchar(30) NOT NULL, `createdDate` datetime NOT NULL, `editedBy` varchar(30) NOT NULL, @@ -6397,7 +6398,7 @@ REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`projectType`,`createdBy`,`crea ('开发','50','dev','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), ('测试','15','qa','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), ('发布','10','release','waterfall','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), -('总结评审','5','review','waterfall','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'); +('总结评审','5','review','waterfall','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'), ('需求','10','request','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), ('设计','10','design','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), ('开发','50','dev','waterfallplus','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), @@ -9707,6 +9708,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewcl` ( `title` varchar(255) NOT NULL, `object` char(30) NOT NULL, `category` char(30) NOT NULL, + `type` varchar(255) NOT NULL, `assignedTo` varchar(30) NOT NULL, `order` mediumint(8) DEFAULT '0', `status` varchar(30) NOT NULL, From 39b2773e77daf8978438db2e67a6bac6271128a6 Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Tue, 21 Feb 2023 15:55:33 +0800 Subject: [PATCH 4/6] * Fix bug #32332. --- module/product/model.php | 4 ++-- module/project/view/create.html.php | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index db69c6d15d..4461499a2b 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1443,11 +1443,11 @@ class productModel extends model $hasWaterfall = false; foreach($projects as $project) { - if($project->model == 'waterfall') $hasWaterfall = true; + if(in_array($project->model, array('waterfall', 'waterfallplus'))) $hasWaterfall = true; } $orderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc'; - $executions = $this->dao->select('t2.id,t2.name,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1') + $executions = $this->dao->select('t2.id,t2.name,t2.project,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id') ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project = t3.id') ->where('t1.product')->eq($productID) diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 5fa5aff2a4..969d9f0164 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -48,11 +48,7 @@

- edition != 'max' or $model == 'kanban'):?> - - -
From 8bf7fa466ced1f5607842e06d8bf39d30cecd242 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 21 Feb 2023 16:05:38 +0800 Subject: [PATCH 5/6] * Fix error of authority group. --- extension/lite/group/ext/lang/resource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index 3ba031f0f2..7cb8bd18cf 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -649,7 +649,7 @@ $lang->resource->custom = new stdclass(); $lang->resource->custom->index = 'index'; $lang->resource->custom->set = 'set'; $lang->resource->custom->product = 'productName'; -$lang->resource->custom->execution = 'execution'; +$lang->resource->custom->execution = 'executionCommon'; $lang->resource->custom->required = 'required'; $lang->resource->custom->restore = 'restore'; $lang->resource->custom->flow = 'flow'; From 8d2abc483da841a700f4c18cdec695ec1686b78e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 21 Feb 2023 16:14:27 +0800 Subject: [PATCH 6/6] * Fixed print navigation issues. --- module/admin/lang/menu.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php index 2bbae23365..33b05eeafc 100644 --- a/module/admin/lang/menu.php +++ b/module/admin/lang/menu.php @@ -186,8 +186,11 @@ if($config->edition != 'max') if(!helper::hasFeature('waterfall')) { unset($lang->admin->menuList->model['subMenu']['waterfall']); - unset($lang->admin->menuList->model['subMenu']['waterfallplus']); unset($lang->admin->menuList->model['menuOrder']['15']); +} +if(!helper::hasFeature('waterfallplus')) +{ + unset($lang->admin->menuList->model['subMenu']['waterfallplus']); unset($lang->admin->menuList->model['menuOrder']['25']); } if($config->edition == 'max')