From 3b415a49ec9ca3495dde20d228f5424484d4c150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=94=E4=BB=A4=E8=8C=82?= Date: Tue, 17 Jan 2023 15:25:59 +0800 Subject: [PATCH 01/14] + Resolved feedback #2016, the api my work task response error. --- module/my/control.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/my/control.php b/module/my/control.php index 78dcb8192d..0b8c80881c 100755 --- a/module/my/control.php +++ b/module/my/control.php @@ -198,6 +198,8 @@ class my extends control $meetingCount = $pager->recTotal; } + if($this->app->viewType != 'json') + { echo << var taskCount = $taskCount; @@ -227,6 +229,7 @@ if(isMax !== 0) } EOF; + } } /** From 4f5e7ef2e8f1919d17be86ca7815a65518bd2ae2 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 21 Feb 2023 17:20:53 +0800 Subject: [PATCH 02/14] * Increment to the value of null time. --- framework/helper.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/helper.class.php b/framework/helper.class.php index 6435c7b69e..cb474da2c8 100644 --- a/framework/helper.class.php +++ b/framework/helper.class.php @@ -339,12 +339,12 @@ class helper extends baseHelper $dateInterval->hour = $interval->format('%H'); $dateInterval->minute = $interval->format('%i'); $dateInterval->secound = $interval->format('%s'); - $dateInterval->year = ltrim($dateInterval->year, '0'); - $dateInterval->month = ltrim($dateInterval->month, '0'); - $dateInterval->day = ltrim($dateInterval->day, '0'); - $dateInterval->hour = ltrim($dateInterval->hour, '0'); - $dateInterval->minute = ltrim($dateInterval->minute, '0'); - $dateInterval->secound = ltrim($dateInterval->secound, '0'); + $dateInterval->year = $dateInterval->year == '00' ? 0 : ltrim($dateInterval->year, '0'); + $dateInterval->month = $dateInterval->month == '00' ? 0 : ltrim($dateInterval->month, '0'); + $dateInterval->day = $dateInterval->day == '00' ? 0 : ltrim($dateInterval->day, '0'); + $dateInterval->hour = $dateInterval->hour == '00' ? 0 : ltrim($dateInterval->hour, '0'); + $dateInterval->minute = $dateInterval->minute == '00' ? 0 : ltrim($dateInterval->minute, '0'); + $dateInterval->secound = $dateInterval->secound == '00' ? 0 : ltrim($dateInterval->secound, '0'); } return $dateInterval; } From 98a5efb31ce00c608a5a149d1262c487a84a8d92 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 22 Feb 2023 01:34:50 +0000 Subject: [PATCH 03/14] * Recovery code. --- module/project/view/create.html.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 969d9f0164..5fa5aff2a4 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -48,7 +48,11 @@

+ edition != 'max' or $model == 'kanban'):?> + + +
From ae8e745acde6132e3bbed00134838740781e02d5 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 22 Feb 2023 01:42:50 +0000 Subject: [PATCH 04/14] * Finish task #85042. --- db/update18.1.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/db/update18.1.sql b/db/update18.1.sql index feba83e887..ef6ffc263f 100644 --- a/db/update18.1.sql +++ b/db/update18.1.sql @@ -25,3 +25,6 @@ ALTER table `zt_reviewcl` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `cat UPDATE `zt_reviewcl` SET `type` = 'waterfall' WHERE `type` = ''; UPDATE `zt_activity` SET `order` = `id` * 5 WHERE `order` = '0'; + +ALTER table `zt_cmcl` ADD `projectType` varchar(255) NOT NULL DEFAULT '' AFTER `type`; +UPDATE `zt_cmcl` SET `projectType` = 'waterfall' WHERE `projectType` = ''; From ff7ff98bff7981566e1a432a7d0c8c478eed48bb Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 22 Feb 2023 01:44:23 +0000 Subject: [PATCH 05/14] * Finish task #85042. --- db/zentao.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/zentao.sql b/db/zentao.sql index cad8faf602..9abe206715 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -9780,6 +9780,7 @@ CREATE TABLE IF NOT EXISTS `zt_reviewlist` ( CREATE TABLE IF NOT EXISTS `zt_cmcl` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `type` char(30) NOT NULL, + `projectType` varchar(255) NOT NULL, `title` int(11) NOT NULL, `contents` text NOT NULL, `assignedTo` varchar(30) NOT NULL, From 49e0ae82c6d843cfbd442b8130093808767874e7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 09:54:38 +0800 Subject: [PATCH 06/14] * Code for finish task #85415. --- module/programplan/css/create.css | 1 + module/programplan/js/create.js | 2 ++ module/programplan/lang/de.php | 2 ++ module/programplan/lang/en.php | 2 ++ module/programplan/lang/fr.php | 2 ++ module/programplan/lang/zh-cn.php | 2 ++ module/programplan/view/create.html.php | 2 ++ 7 files changed, 13 insertions(+) diff --git a/module/programplan/css/create.css b/module/programplan/css/create.css index eb0ae52c08..0dadb2e441 100644 --- a/module/programplan/css/create.css +++ b/module/programplan/css/create.css @@ -1 +1,2 @@ #planForm tr td {vertical-align: top;} +#mainContent .methodTitle, #mainContent .methodTip {display: inline-block; vertical-align: middle;} diff --git a/module/programplan/js/create.js b/module/programplan/js/create.js index 241610d959..13f91ece2d 100644 --- a/module/programplan/js/create.js +++ b/module/programplan/js/create.js @@ -5,6 +5,8 @@ $(function() $(this).removeClass('has-error'); $(this).closest('td').find('.text-danger.help-text').remove(); }); + + $('[data-toggle="popover"]').popover(); }); /** * Add item to create view of programplan. diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index 5068fce91a..d38761d96b 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -20,6 +20,7 @@ $lang->programplan->delete = 'Delete Stage'; $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Plan'; +$lang->programplan->subPlanManage = 'Sub-stages management'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; @@ -72,6 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 689cfeb296..54f7e2a020 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -20,6 +20,7 @@ $lang->programplan->delete = 'Delete Stage'; $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Stage'; +$lang->programplan->subPlanManage = 'Sub-stages management'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; @@ -72,6 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index 5068fce91a..d38761d96b 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -20,6 +20,7 @@ $lang->programplan->delete = 'Delete Stage'; $lang->programplan->close = 'Close Stage'; $lang->programplan->activate = 'Activate Stage'; $lang->programplan->createSubPlan = 'Create Sub Plan'; +$lang->programplan->subPlanManage = 'Sub-stages management'; $lang->programplan->parent = 'Parent Stage'; $lang->programplan->emptyParent = 'N/A'; @@ -72,6 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index fcf4a5d0d6..46ed1022d9 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -20,6 +20,7 @@ $lang->programplan->delete = '删除阶段'; $lang->programplan->close = '关闭阶段'; $lang->programplan->activate = '激活阶段'; $lang->programplan->createSubPlan = '创建子阶段'; +$lang->programplan->subPlanManage = '子阶段的管理方法'; $lang->programplan->parent = '父阶段'; $lang->programplan->emptyParent = '无'; @@ -72,6 +73,7 @@ $lang->programplan->emptyBegin = '『计划开始』日期不能为空'; $lang->programplan->emptyEnd = '『计划完成』日期不能为空'; $lang->programplan->checkBegin = '『计划开始』应当为合法的日期'; $lang->programplan->checkEnd = '『计划完成』应当为合法的日期'; +$lang->programplan->methodTip = '融合瀑布项目阶段子阶段创建时，可以选择创建为阶段或创建为迭代/看板。子阶段为迭代/看板，不支持继续向下创建子级。'; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index ded8e02027..58082983e3 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -45,6 +45,7 @@
model == 'waterfallplus'):?>
+
programplan->subPlanManage . ':'?>
programplan->typeList, $executionType);?>
    @@ -57,6 +58,7 @@ ?>
+
From 200e97d5b87d6368b573702293d34a86d48ba906 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 09:55:00 +0800 Subject: [PATCH 07/14] * Code for finish task #85414. --- module/execution/css/create.css | 1 + module/execution/js/create.js | 2 ++ module/execution/lang/de.php | 1 + module/execution/lang/en.php | 1 + module/execution/lang/fr.php | 1 + module/execution/lang/zh-cn.php | 1 + module/execution/view/create.html.php | 5 ++++- 7 files changed, 11 insertions(+), 1 deletion(-) diff --git a/module/execution/css/create.css b/module/execution/css/create.css index 8a387053df..8ba2c65184 100644 --- a/module/execution/css/create.css +++ b/module/execution/css/create.css @@ -39,3 +39,4 @@ .productsBox .required + .text-danger.help-text {position: relative; left: 10px;} .productsBox > #productNameLabel {padding-top: 8px;} .productsBox div[id^='branch'].chosen-disabled {pointer-events: none;} +.methodTip icon:before {margin-bottom: 5px;} diff --git a/module/execution/js/create.js b/module/execution/js/create.js index 750bdae6b0..56ac637410 100644 --- a/module/execution/js/create.js +++ b/module/execution/js/create.js @@ -153,6 +153,8 @@ $(function() { $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled'); } + + $('[data-toggle="popover"]').popover(); }); function showLifeTimeTips() diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index d6c506033d..18aca85146 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -151,6 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; +$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Aktivieren'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 995e4f9d53..6988621fe7 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -151,6 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; +$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Activate'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index ac5351d360..f1a5947449 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -151,6 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; +$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; $lang->execution->start = 'Démarrer'; $lang->execution->activate = 'Activer'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index a83b65dc25..136a6450b9 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -151,6 +151,7 @@ $lang->execution->left = '剩余'; $lang->execution->copyTeamTip = "可以选择复制项目或{$lang->execution->common}团队的成员"; $lang->execution->daysGreaterProject = '可用工日不能大于执行的可用工日『%s』'; $lang->execution->errorHours = '可用工时/天不能大于『24』'; +$lang->execution->agileplusMethodTip = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。'; $lang->execution->start = "开始"; $lang->execution->activate = "激活"; diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index cb134dfd7e..f8e6f80772 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -66,7 +66,10 @@ execution->method;?> execution->typeList, $type, "class='form-control chosen' required onchange='setType(this.value)'");?> - + + + + From 94d1f20de597f2c54549b134e18f3d5eab2a22e2 Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Wed, 22 Feb 2023 09:56:16 +0800 Subject: [PATCH 08/14] * Add the not passed parameter. --- module/repo/control.php | 2 +- module/repo/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/repo/control.php b/module/repo/control.php index 77e1813617..fead011113 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -599,7 +599,7 @@ class repo extends control } /* Refresh repo. */ - if($refresh) $this->repo->updateCommit($repoID, $originBranchID); + if($refresh) $this->repo->updateCommit($repoID, $objectID, $originBranchID); /* Get files info. */ $infos = $this->repo->getFileCommits($repo, $branchID, $path); diff --git a/module/repo/model.php b/module/repo/model.php index 9580df4837..3a9aa88859 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -2810,7 +2810,7 @@ class repoModel extends model * @access public * @return void */ - public function updateCommit($repoID, $branchID = 0) + public function updateCommit($repoID, $objectID = 0, $branchID = 0) { $repo = $this->getRepoByID($repoID); /* Update code commit history. */ From 22f081736fdc38d2ebd72373d3cb15e8676c92d6 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 22 Feb 2023 02:01:04 +0000 Subject: [PATCH 09/14] * Fix bug for task #85039. --- module/stage/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/stage/model.php b/module/stage/model.php index 78e1ce28c6..c475e5e196 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -199,7 +199,7 @@ class stageModel extends model $moduleName = $this->app->rawModule; $methodName = $this->app->rawMethod; if(!isset($this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfall']['exclude'] = ''; - if(!isset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'])) $this->lang->admin->menuList->model['subMenu']['agileplus']['exclude'] = ''; + if(!isset($this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'])) $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] = ''; if($type == 'waterfall') { $this->lang->admin->menuList->model['subMenu']['waterfallplus']['exclude'] .= ",{$moduleName}-{$methodName}"; From 3e7b0daf913788534901a0677ca6f18f06a217ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=94=E4=BB=A4=E8=8C=82?= Date: Wed, 22 Feb 2023 10:08:22 +0800 Subject: [PATCH 10/14] * Resove feedback f2188, change privilege by modulue error. --- module/group/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/group/control.php b/module/group/control.php index 525866f45c..eab5efd9b1 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -254,9 +254,9 @@ class group extends control foreach($this->lang->resource as $module => $moduleActions) { $modules[$module] = $this->lang->$module->common; - foreach($moduleActions as $action) + foreach($moduleActions as $key => $action) { - $actions[$module][$action] = $this->lang->$module->$action; + $actions[$module][$key] = $this->lang->$module->$action; } } $this->view->groups = $this->group->getPairs(); From 1c1fd123da3b71edcd342ff2947ab8e0f2859f9e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 10:21:56 +0800 Subject: [PATCH 11/14] * Code for finish task #85415. --- module/programplan/lang/de.php | 2 +- module/programplan/lang/en.php | 2 +- module/programplan/lang/fr.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/programplan/lang/de.php b/module/programplan/lang/de.php index d38761d96b..50fed29663 100644 --- a/module/programplan/lang/de.php +++ b/module/programplan/lang/de.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 54f7e2a020..63ff435c7d 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; diff --git a/module/programplan/lang/fr.php b/module/programplan/lang/fr.php index d38761d96b..50fed29663 100644 --- a/module/programplan/lang/fr.php +++ b/module/programplan/lang/fr.php @@ -73,7 +73,7 @@ $lang->programplan->emptyBegin = '『Begin』should not be blank'; $lang->programplan->emptyEnd = '『End』should not be blank'; $lang->programplan->checkBegin = '『Begin』should be valid date'; $lang->programplan->checkEnd = '『End』should be valid date'; -$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as iterations/Kanban. If the sub-stage is created as an iteration/Kanban, it does not support creating sub-levels further down.'; +$lang->programplan->methodTip = 'When creating sub-stages in a Waterfall Plus project stage, you can choose to create them as stages or as Iterations/Kanban. If the sub-stage is created as an Iteration/Kanban, it does not support creating sub-levels further down.'; $lang->programplan->milestoneList[1] = 'Yes'; $lang->programplan->milestoneList[0] = 'No'; From 9e7fe8f35d64fcaf783e0d0bb17cc00d23cf1e24 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 10:22:29 +0800 Subject: [PATCH 12/14] * Code for finish task #85414. --- module/execution/lang/de.php | 3 ++- module/execution/lang/en.php | 3 ++- module/execution/lang/fr.php | 3 ++- module/execution/lang/zh-cn.php | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 18aca85146..2d31401b68 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -151,7 +151,8 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; -$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; +$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; +$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Aktivieren'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 6988621fe7..420b5ea621 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -151,7 +151,8 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; -$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; +$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; +$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; $lang->execution->start = 'Start'; $lang->execution->activate = 'Activate'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index f1a5947449..b9810ac1a4 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -151,7 +151,8 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; -$lang->execution->agileplusMethodTip = 'When creating executions in an agile Plus project, both iteration and Kanban management methods are supported.'; +$lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; +$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; $lang->execution->start = 'Démarrer'; $lang->execution->activate = 'Activer'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 136a6450b9..211e47444a 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -152,6 +152,7 @@ $lang->execution->copyTeamTip = "可以选择复制项目或{$lang->exec $lang->execution->daysGreaterProject = '可用工日不能大于执行的可用工日『%s』'; $lang->execution->errorHours = '可用工时/天不能大于『24』'; $lang->execution->agileplusMethodTip = '融合敏捷项目创建执行时，支持迭代和看板两种管理方法。'; +$lang->execution->typeTip = '“综合”类型的父阶段可以创建其它类型的子级，其它父子层级的类型均一致。'; $lang->execution->start = "开始"; $lang->execution->activate = "激活"; From deae64dcd1536c0537b1aa3c558bbeedefe17d43 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 10:38:25 +0800 Subject: [PATCH 13/14] * Add a prompt for the execution type. --- module/execution/css/batchedit.css | 2 ++ module/execution/css/batchedit.en.css | 1 + module/execution/js/batchedit.js | 5 +++++ module/execution/js/edit.js | 2 ++ module/execution/lang/de.php | 2 +- module/execution/lang/en.php | 2 +- module/execution/lang/fr.php | 2 +- module/execution/view/batchedit.html.php | 5 ++++- module/execution/view/edit.html.php | 3 +++ module/programplan/js/edit.js | 2 ++ module/programplan/view/edit.html.php | 3 +++ 11 files changed, 25 insertions(+), 4 deletions(-) diff --git a/module/execution/css/batchedit.css b/module/execution/css/batchedit.css index 6051595822..5fb6ae17e4 100644 --- a/module/execution/css/batchedit.css +++ b/module/execution/css/batchedit.css @@ -2,3 +2,5 @@ .c-team-name {width: 120px;} .c-project, .c-user, .c-code, .c-desc, .c-days {width: 150px;} .c-method {width: 45px;} +.c-type > .icon-help {vertical-align: text-top;} +.c-type > .popover .popover-content {font-weight: 400;} diff --git a/module/execution/css/batchedit.en.css b/module/execution/css/batchedit.en.css index 1bc7227968..d4858d89b7 100644 --- a/module/execution/css/batchedit.en.css +++ b/module/execution/css/batchedit.en.css @@ -1,3 +1,4 @@ .c-user {width: 150px !important;} .c-date {width: 125px;} .c-method {width: 60px;} +.c-type {width: 130px;} diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js index db84c6b085..603122e2bd 100644 --- a/module/execution/js/batchedit.js +++ b/module/execution/js/batchedit.js @@ -27,3 +27,8 @@ $('#executionForm').on('change input mousedown', '.has-error', function() $(this).parent().find('.text-danger').remove(); $(this).removeClass('has-error'); }) + +$(function() +{ + $('[data-toggle="popover"]').popover(); +}) diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js index 5527fd5b0b..58f5d31712 100644 --- a/module/execution/js/edit.js +++ b/module/execution/js/edit.js @@ -112,6 +112,8 @@ $(function() { $('.disabledBranch div[id^="branch"]').addClass('chosen-disabled'); } + + $('[data-toggle="popover"]').popover(); }) var lastProjectID = $("#project").val(); diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 2d31401b68..aacc1a5dba 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Start'; $lang->execution->activate = 'Aktivieren'; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index 420b5ea621..d8f522124d 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Start'; $lang->execution->activate = 'Activate'; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index b9810ac1a4..46f9661aa7 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -152,7 +152,7 @@ $lang->execution->copyTeamTip = "copy Project/project team members"; $lang->execution->daysGreaterProject = 'Days cannot be greater than days of execution 『%s』'; $lang->execution->errorHours = 'Hours/Day cannot be greater than『24』'; $lang->execution->agileplusMethodTip = 'When creating executions in an Agile Plus project, both Iteration and Kanban management methods are supported.'; -$lang->execution->typeTip = 'The sub-stages of other types can be created under the parent stage of the "mix" type, while the type of other parent-child levels is consistent.'; +$lang->execution->typeTip = "The sub-stages of other types can be created under the parent stage of the 'mix' type, while the type of other parent-child levels is consistent."; $lang->execution->start = 'Démarrer'; $lang->execution->activate = 'Activer'; diff --git a/module/execution/view/batchedit.html.php b/module/execution/view/batchedit.html.php index 5b95828e0f..d78ab1d11f 100755 --- a/module/execution/view/batchedit.html.php +++ b/module/execution/view/batchedit.html.php @@ -62,7 +62,10 @@ '>execution->PO;?> '>execution->QD;?> '>execution->RD;?> - '>execution->$type;?> + '> + execution->$type;?> + + execution->begin;?> execution->end;?> '>execution->$desc;?> diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php index 6ade126e6e..d5d43fe019 100644 --- a/module/execution/view/edit.html.php +++ b/module/execution/view/edit.html.php @@ -98,6 +98,9 @@ } ?> + + + diff --git a/module/programplan/js/edit.js b/module/programplan/js/edit.js index c8854adfdc..e552fb8cc9 100644 --- a/module/programplan/js/edit.js +++ b/module/programplan/js/edit.js @@ -57,4 +57,6 @@ $(function() if(!result) return false; } }) + + $('[data-toggle="popover"]').popover(); }) diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index ad7e3c569e..634d17b3d4 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -60,6 +60,9 @@ stage->typeList, $plan->attribute, "class='form-control'") : zget($lang->stage->typeList, $plan->attribute);?> + + + setMilestone):?> From 650e440acce78fa9037e4e2f00681305e0fb8733 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Feb 2023 11:11:14 +0800 Subject: [PATCH 14/14] * Code for finish task #85046. --- module/custom/model.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/module/custom/model.php b/module/custom/model.php index a497df3e59..edcadec2f5 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -1134,13 +1134,15 @@ class customModel extends model $disabledFeatures = $this->setting->getItem('owner=system&module=common§ion=&key=disabledFeatures'); $disabledFeatures = $disabledFeatures . ',' . $closedFeatures; - $hasWaterfall = strpos(",{$disabledFeatures},", ',waterfall,') === false; - $hasWaterfallPlus = strpos(",{$disabledFeatures},", ',waterfallplus,') === false; - $hasScrumMeasrecord = strpos(",{$disabledFeatures},", ',scrumMeasrecord,') === false; - $hasWaterfallMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and ($hasWaterfall or $hasWaterfallPlus)); + $hasWaterfall = strpos(",{$disabledFeatures},", ',waterfall,') === false; + $hasWaterfallPlus = strpos(",{$disabledFeatures},", ',waterfallplus,') === false; + $hasScrumMeasrecord = strpos(",{$disabledFeatures},", ',scrumMeasrecord,') === false; + $hasAgilePlusMeasrecord = strpos(",{$disabledFeatures},", ',agileMeasrecord,') === false; + $hasWaterfallMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallMeasrecord,') === false and $hasWaterfall); + $hasWaterfallPlusMeasrecord = (strpos(",{$disabledFeatures},", ',waterfallplusMeasrecord,') === false and $hasWaterfallPlus); $cronStatus = 'normal'; - if(!$hasScrumMeasrecord and !$hasWaterfallMeasrecord) $cronStatus = 'stop'; + if(!$hasScrumMeasrecord and !$hasAgilePlusMeasrecord and !$hasWaterfallMeasrecord and $hasWaterfallPlusMeasrecord) $cronStatus = 'stop'; $this->loadModel('cron'); $cron = $this->dao->select('id,status')->from(TABLE_CRON)->where('command')->like('%methodName=initCrontabQueue')->fetch();