From e49090d03ad51e6da5b3d3e377bf7351e62ae982 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Mar 2023 09:43:54 +0800 Subject: [PATCH 1/3] * Fix bug 32911. --- module/execution/lang/de.php | 2 +- module/execution/lang/en.php | 2 +- module/execution/lang/fr.php | 2 +- module/execution/lang/zh-cn.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 53602f7928..166462e62e 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -151,7 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy {$lang->projectCommon}/{$lang->execution->common} 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 {$lang->projectCommon}, both Iteration and Kanban management methods are supported."; +$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both {$lang->executionCommon} 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->waterfallTip = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},"; diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php index e4573713aa..e83738260f 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -151,7 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy {$lang->projectCommon}/{$lang->execution->common} 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 {$lang->projectCommon}, both Iteration and Kanban management methods are supported."; +$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both {$lang->executionCommon} 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->waterfallTip = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},"; diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php index c77f54024d..182e5766da 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -151,7 +151,7 @@ $lang->execution->left = 'Left'; $lang->execution->copyTeamTip = "copy {$lang->projectCommon}/{$lang->execution->common} 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 {$lang->projectCommon}, both Iteration and Kanban management methods are supported."; +$lang->execution->agileplusMethodTip = "When creating executions in an Agile Plus {$lang->projectCommon}, both {$lang->executionCommon} 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->waterfallTip = "In the Waterfall {$lang->projectCommon} or in the Waterfall + {$lang->projectCommon},"; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index cbdd12c0a4..b5fc440213 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -151,7 +151,7 @@ $lang->execution->left = '剩余'; $lang->execution->copyTeamTip = "可以选择复制{$lang->projectCommon}或{$lang->execution->common}团队的成员"; $lang->execution->daysGreaterProject = '可用工日不能大于执行的可用工日『%s』'; $lang->execution->errorHours = '可用工时/天不能大于『24』'; -$lang->execution->agileplusMethodTip = "融合敏捷{$lang->projectCommon}创建执行时，支持迭代和看板两种管理方法。"; +$lang->execution->agileplusMethodTip = "融合敏捷{$lang->projectCommon}创建执行时，支持{$lang->executionCommon}和看板两种管理方法。"; $lang->execution->typeTip = '“综合”类型的父阶段可以创建其它类型的子级，其它父子层级的类型均一致。'; $lang->execution->waterfallTip = "瀑布{$lang->projectCommon}和融合瀑布{$lang->projectCommon}中，"; From 7e17061d3d0e8eabd80873f6e364e074b79e8e98 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Mar 2023 10:41:33 +0800 Subject: [PATCH 2/3] * Fix bug 32928. --- module/bug/view/ajaxgetdropmenu.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/view/ajaxgetdropmenu.html.php b/module/bug/view/ajaxgetdropmenu.html.php index 1e41d00e47..b357ba8535 100644 --- a/module/bug/view/ajaxgetdropmenu.html.php +++ b/module/bug/view/ajaxgetdropmenu.html.php @@ -21,12 +21,12 @@ $productsHtml = (count($products) > 1 and strpos(',zeroCase,browseUnits,groupC foreach($products as $product) { - $selected = $product->id == $productID ? 'selected' : ''; + $selected = $product->id == $productID ? 'selected' : 'text-primary'; $productName = ($product->program and $this->config->systemMode == 'ALM') ? zget($programs, $product->program, '') . '/' : ''; $productName .= ($this->config->systemMode == 'ALM' and $product->line) ? zget($lines, $product->line, '') . '/' . $product->name : $product->name; $objectID = ($product->type != 'platform' && $module == 'branch' && $method == 'manage') ? $productID : $product->id; $linkHtml = $this->product->setParamsForLink($module, $link, $projectID, $product->id); - $productsHtml .= html::a($linkHtml, $productName, '', "class='text-primary $selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='{$this->app->tab}'"); + $productsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='{$this->app->tab}'"); } ?>
From 3756e90cfd9de75c2027d0c3e4be12b524c41545 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Mar 2023 10:41:40 +0800 Subject: [PATCH 3/3] * Fix bug 32929. --- module/product/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/product/model.php b/module/product/model.php index 74b667c58c..2e1c3fb4f8 100755 --- a/module/product/model.php +++ b/module/product/model.php @@ -1485,6 +1485,7 @@ class productModel extends model $executionName = $projectID != 0 ? '' : $execution->projectName; foreach($paths as $path) { + if(!isset($allExecutions[$path])) continue; $executionName .= '/' . $allExecutions[$path]->name; }