From 6a5e9b8657d58856a941662621523526a908a229 Mon Sep 17 00:00:00 2001 From: renying Date: Fri, 29 Apr 2022 02:50:51 +0000 Subject: [PATCH 1/4] Fixbug#21999 --- module/testcase/lang/zh-cn.php | 1 + module/testcase/model.php | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index e33dfef75a..390bfe3773 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -223,6 +223,7 @@ $lang->testcase->buttonToList = '返回'; $lang->testcase->errorEncode = '无数据，请选择正确的编码重新上传！'; $lang->testcase->noFunction = '不存在iconv和mb_convert_encoding转码方法，不能将数据转成想要的编码！'; $lang->testcase->noRequire = "%s行的“%s”是必填字段，不能为空"; +$lang->testcase->noRequireTip = "“%s”是必填字段，不能为空"; $lang->testcase->noLibrary = "现在还没有用例库，请先创建！"; $lang->testcase->mustChooseResult = '必须选择评审结果'; $lang->testcase->noModule = '
您现在还没有模块信息
请维护测试模块
'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 4bd0abe109..1bc5bf89d1 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1210,8 +1210,9 @@ class testcaseModel extends model } $storyVersionPairs = $this->story->getVersions($data->story); - $cases = array(); - $line = 1; + $cases = array(); + $line = 1; + $noRequireTip = array(); foreach($data->product as $key => $product) { $caseData = new stdclass(); @@ -1235,7 +1236,7 @@ class testcaseModel extends model { $requiredField = trim($requiredField); if(!isset($caseData->$requiredField)) continue; - if(empty($caseData->$requiredField)) dao::$errors[] = sprintf($this->lang->testcase->noRequire, $line, $this->lang->testcase->$requiredField); + if(empty($caseData->$requiredField) and !array_key_exists($requiredField, $noRequireTip)) $noRequireTip[$requiredField] = $this->lang->testcase->$requiredField; } } @@ -1252,6 +1253,8 @@ class testcaseModel extends model $cases[$key] = $caseData; $line++; } + if(!empty($noRequireTip)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $noRequireTip)); + if(dao::isError()) return false; $forceNotReview = $this->forceNotReview(); From e06c2e8666857f158bfbc13c33afdfde5a524dfa Mon Sep 17 00:00:00 2001 From: renying Date: Fri, 29 Apr 2022 03:10:49 +0000 Subject: [PATCH 2/4] Fixbug#21999 --- module/testcase/model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 1bc5bf89d1..ba9fc5a5d6 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1210,9 +1210,9 @@ class testcaseModel extends model } $storyVersionPairs = $this->story->getVersions($data->story); - $cases = array(); - $line = 1; - $noRequireTip = array(); + $cases = array(); + $line = 1; + $errorMessages = array(); foreach($data->product as $key => $product) { $caseData = new stdclass(); @@ -1236,7 +1236,7 @@ class testcaseModel extends model { $requiredField = trim($requiredField); if(!isset($caseData->$requiredField)) continue; - if(empty($caseData->$requiredField) and !array_key_exists($requiredField, $noRequireTip)) $noRequireTip[$requiredField] = $this->lang->testcase->$requiredField; + if(empty($caseData->$requiredField) and !array_key_exists($requiredField, $errorMessages)) $errorMessages[$requiredField] = $this->lang->testcase->$requiredField; } } @@ -1253,7 +1253,7 @@ class testcaseModel extends model $cases[$key] = $caseData; $line++; } - if(!empty($noRequireTip)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $noRequireTip)); + if(!empty($errorMessages)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $errorMessages)); if(dao::isError()) return false; From a2430ed5076ae8f63a9bfe653988f84e80b5daa4 Mon Sep 17 00:00:00 2001 From: renying Date: Fri, 29 Apr 2022 03:13:32 +0000 Subject: [PATCH 3/4] Fixbug#21999 --- module/testcase/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index ba9fc5a5d6..3d3244ed20 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1236,7 +1236,7 @@ class testcaseModel extends model { $requiredField = trim($requiredField); if(!isset($caseData->$requiredField)) continue; - if(empty($caseData->$requiredField) and !array_key_exists($requiredField, $errorMessages)) $errorMessages[$requiredField] = $this->lang->testcase->$requiredField; + if(empty($caseData->$requiredField) and !isset($errorMessages[$requiredField])) $errorMessages[$requiredField] = $this->lang->testcase->$requiredField; } } From d17854d07ddddbc8ffb0cce70ed8410cc8b0a6f4 Mon Sep 17 00:00:00 2001 From: renying Date: Fri, 29 Apr 2022 05:11:53 +0000 Subject: [PATCH 4/4] Fixbug#21999 --- module/testcase/model.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/testcase/model.php b/module/testcase/model.php index 3d3244ed20..d847c28cce 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1210,9 +1210,9 @@ class testcaseModel extends model } $storyVersionPairs = $this->story->getVersions($data->story); - $cases = array(); - $line = 1; - $errorMessages = array(); + $cases = array(); + $line = 1; + $fieldNames = array(); foreach($data->product as $key => $product) { $caseData = new stdclass(); @@ -1236,7 +1236,7 @@ class testcaseModel extends model { $requiredField = trim($requiredField); if(!isset($caseData->$requiredField)) continue; - if(empty($caseData->$requiredField) and !isset($errorMessages[$requiredField])) $errorMessages[$requiredField] = $this->lang->testcase->$requiredField; + if(empty($caseData->$requiredField) and !isset($fieldNames[$requiredField])) $fieldNames[$requiredField] = $this->lang->testcase->$requiredField; } } @@ -1253,7 +1253,7 @@ class testcaseModel extends model $cases[$key] = $caseData; $line++; } - if(!empty($errorMessages)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $errorMessages)); + if(!empty($fieldNames)) dao::$errors = sprintf($this->lang->testcase->noRequireTip, implode(',', $fieldNames)); if(dao::isError()) return false;