From 1fe958fd5fa04278a07e9b1bd805fbb7c4803e91 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 26 Jul 2021 14:13:00 +0800 Subject: [PATCH 1/3] * Finish task #40458. --- module/testcase/control.php | 3 +-- module/testcase/view/view.html.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index 5ed65aa4ed..884299d67a 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -642,11 +642,10 @@ class testcase extends control if($this->app->openApp == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch); $this->view->title = "CASE #$case->id $case->title - " . $this->products[$productID]; - $this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]); $this->view->product = $product; $this->view->branches = $branches; - $this->view->productName = $this->products[$productID]; + $this->view->productName = isset($this->products[$productID]) ? $this->products[$productID] : ''; $this->view->branchName = $product->type == 'normal' ? '' : zget($branches, $case->branch, ''); } diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index 35a40d8326..c3707c1155 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -151,7 +151,7 @@ testcase->product;?> - createLink('product', 'browse', "productID=$case->product"), $productName) : $productName;?> + createLink('product', 'browse', "productID=$case->product"), $productName) : $productName;?> type != 'normal'):?> From 5c313eef531c00067cc4a42ecf6892e21267a4e4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 26 Jul 2021 16:22:01 +0800 Subject: [PATCH 2/3] * Finish task #40431. --- module/product/lang/de.php | 2 +- module/product/lang/en.php | 2 +- module/product/lang/fr.php | 2 +- module/product/lang/vi.php | 2 +- module/product/lang/zh-cn.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/product/lang/de.php b/module/product/lang/de.php index c96d8e64a6..8b1cb9a2c3 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -26,7 +26,7 @@ $lang->product->other = 'Andere'; $lang->product->closed = 'Geschlossen'; $lang->product->updateOrder = 'Ranking'; $lang->product->orderAction = "Rank {$lang->productCommon}"; -$lang->product->all = "Alle {$lang->productCommon}"; +$lang->product->all = "{$lang->productCommon} List"; $lang->product->manageLine = "Manage {$lang->productCommon} Line"; $lang->product->newLine = "Create {$lang->productCommon} Line"; $lang->product->export = 'Exportiere Daten'; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 32afdb17ae..9830b23769 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -24,7 +24,7 @@ $lang->product->mine = 'Mine'; $lang->product->other = 'Others'; $lang->product->closed = 'Closed'; $lang->product->updateOrder = 'Order'; -$lang->product->all = "All {$lang->productCommon}s"; +$lang->product->all = "{$lang->productCommon} List"; $lang->product->manageLine = "Manage {$lang->productCommon} Line"; $lang->product->newLine = "Create {$lang->productCommon} Line"; $lang->product->export = 'Export'; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index d8733d015e..e5e9f9a337 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -26,7 +26,7 @@ $lang->product->other = 'Autres'; $lang->product->closed = 'Fermés'; $lang->product->updateOrder = 'Ordre'; $lang->product->orderAction = "Rang {$lang->productCommon}"; -$lang->product->all = "Tous les {$lang->productCommon}s"; +$lang->product->all = "{$lang->productCommon} List"; $lang->product->manageLine = "Manage {$lang->productCommon} Line"; $lang->product->newLine = "Create {$lang->productCommon} Line"; $lang->product->export = 'Export'; diff --git a/module/product/lang/vi.php b/module/product/lang/vi.php index 270cda8ec6..99615645b8 100644 --- a/module/product/lang/vi.php +++ b/module/product/lang/vi.php @@ -26,7 +26,7 @@ $lang->product->other = 'Khác'; $lang->product->closed = 'Đã đóng'; $lang->product->updateOrder = 'Sắp xếp'; $lang->product->orderAction = "Đánh giá {$lang->productCommon}"; -$lang->product->all = "Tất cả {$lang->productCommon}"; +$lang->product->all = "{$lang->productCommon} List"; $lang->product->manageLine = "Manage {$lang->productCommon} Line"; $lang->product->newLine = "Create {$lang->productCommon} Line"; $lang->product->export = 'Xuất'; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 7d59a2f19a..934fa90cb4 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -24,7 +24,7 @@ $lang->product->mine = '我负责'; $lang->product->other = '其他'; $lang->product->closed = '已关闭'; $lang->product->updateOrder = '排序'; -$lang->product->all = "所有{$lang->productCommon}"; +$lang->product->all = "{$lang->productCommon}列表"; $lang->product->manageLine = "维护{$lang->productCommon}线"; $lang->product->newLine = "新建{$lang->productCommon}线"; $lang->product->export = '导出数据'; From 12fb7839b79a6e0d55118624f7c7ee5514555b4e Mon Sep 17 00:00:00 2001 From: zenggang Date: Mon, 26 Jul 2021 16:47:26 +0800 Subject: [PATCH 3/3] * Finish task #40461 --- module/execution/model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index f58abd70bd..9117c74865 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -442,7 +442,7 @@ class executionModel extends model $oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch(); /* Judgment of required items. */ - if($this->post->code == '') + if($oldExecution->type != 'stage' and $this->post->code == '') { dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code); return false; @@ -502,7 +502,7 @@ class executionModel extends model ->checkIF($execution->begin != '', 'begin', 'date') ->checkIF($execution->end != '', 'end', 'date') ->checkIF($execution->end != '', 'end', 'gt', $execution->begin) - ->check('code', 'unique', "id!=$executionID and deleted='0'") + ->check('code', 'unique', "id!=$executionID and code!='' and deleted='0'") ->where('id')->eq($executionID) ->limit(1) ->exec(); @@ -609,11 +609,11 @@ class executionModel extends model $nameList[$executionName] = $executionName; /* Check unique code for edited executions. */ - if(empty($executionCode)) + if($projectModel == 'scrum' and empty($executionCode)) { dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->notempty, $this->lang->project->code); } - else + elseif(!empty($executionCode)) { /* Check unique code for edited executions. */ if(isset($codeList[$executionCode])) dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->unique, $this->lang->project->code, $executionCode);