diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 334ea2933e..5d023e005f 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'Prüfungsergebnis wird benötigt.'; $lang->testcase->noModule = '
Es existieren keine Module
Jetzt verwalten
'; $lang->testcase->noCase = 'Keine Fälle. '; $lang->testcase->importedCases = 'The case with ID%s has been imported in the same module and has been ignored.'; +$lang->testcase->importedFromLib = '%s items imported successfully: %s.'; $lang->testcase->searchStories = 'Story suchen'; $lang->testcase->selectLib = 'Bibliothek wählen'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index e3179dc8da..5189effcb4 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'Review result is required.'; $lang->testcase->noModule = '
You have no modules.
Manage it now.
'; $lang->testcase->noCase = 'No cases yet. '; $lang->testcase->importedCases = 'The case with ID%s has been imported in the same module and has been ignored.'; +$lang->testcase->importedFromLib = '%s items imported successfully: %s.'; $lang->testcase->searchStories = 'Enter to search for stories'; $lang->testcase->selectLib = 'Select Library'; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 9296750827..295f603f0c 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'La Validation du résultat est nécessaire. $lang->testcase->noModule = "
Vous n'avez aucun modules.
Gérer les modules maintenant.
"; $lang->testcase->noCase = "Aucun CasTest pour l'instant. "; $lang->testcase->importedCases = 'Le cas d\'utilisation avec l\'ID %s est déjà importé dans le même module, il est donc ignoré.'; +$lang->testcase->importedFromLib = '%s items imported successfully: %s.'; $lang->testcase->searchStories = 'Rechercher des stories'; $lang->testcase->selectLib = 'Sélectionner Library'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 617d57b7e9..b2ffbfdc3f 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = '必须选择评审结果'; $lang->testcase->noModule = '
您现在还没有模块信息
请维护测试模块
'; $lang->testcase->noCase = '暂时没有用例。'; $lang->testcase->importedCases = 'ID为 %s 的用例在相同模块已经导入,已忽略。'; +$lang->testcase->importedFromLib = '导入成功%s项:%s。'; $lang->testcase->searchStories = "键入来搜索{$lang->SRCommon}"; $lang->testcase->selectLib = '请选择库'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 8c81cbc16b..ec51f37081 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1930,10 +1930,11 @@ class testcaseModel extends model $caseModules[$branch] = $this->loadModel('testsuite')->getCanImportModules($productID, $libID, $branch); } - $libCases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id'); - $libSteps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case'); - $libFiles = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id'); - $imported = ''; + $libCases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id'); + $libSteps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in($data->caseIdList)->orderBy('id')->fetchGroup('case'); + $libFiles = $this->dao->select('*')->from(TABLE_FILE)->where('objectID')->in($data->caseIdList)->andWhere('objectType')->eq('testcase')->fetchGroup('objectID', 'id'); + $hasImported = ''; + $importedCases = array(); foreach($libCases as $libCaseID => $case) { $case->fromCaseID = $case->id; @@ -1946,7 +1947,7 @@ class testcaseModel extends model $branch = isset($case->branch) ? $case->branch : 0; if(empty($caseModules[$branch][$case->fromCaseID][$case->module])) { - $imported .= "$case->fromCaseID,"; + $hasImported .= "$case->fromCaseID,"; continue; } @@ -1991,12 +1992,18 @@ class testcaseModel extends model unset($file->id); $this->dao->insert(TABLE_FILE)->data($file)->exec(); } + + $importedCases[] = $libCaseID; + $this->loadModel('action')->create('case', $caseID, 'fromlib', '', $case->lib); } - if(!empty($imported)) + + if(!empty($importedCases)) print(js::alert(sprintf($this->lang->testcase->importedFromLib, count($importedCases), implode(',', $importedCases)))); + + if(!empty($hasImported)) { - $imported = trim($imported, ','); - return print(js::error(sprintf($this->lang->testcase->importedCases, $imported))); + $hasImported = trim($hasImported, ','); + return print(js::error(sprintf($this->lang->testcase->importedCases, $hasImported))); } }