* Finish task #103983.
This commit is contained in:
@@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'Prüfungsergebnis wird benötigt.';
|
||||
$lang->testcase->noModule = '<div>Es existieren keine Module</div><div>Jetzt verwalten</div>';
|
||||
$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';
|
||||
|
||||
@@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'Review result is required.';
|
||||
$lang->testcase->noModule = '<div>You have no modules.</div><div>Manage it now.</div>';
|
||||
$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';
|
||||
|
||||
@@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = 'La Validation du résultat est nécessaire.
|
||||
$lang->testcase->noModule = "<div>Vous n'avez aucun modules.</div><div>Gérer les modules maintenant.</div>";
|
||||
$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';
|
||||
|
||||
@@ -246,6 +246,7 @@ $lang->testcase->mustChooseResult = '必须选择评审结果';
|
||||
$lang->testcase->noModule = '<div>您现在还没有模块信息</div><div>请维护测试模块</div>';
|
||||
$lang->testcase->noCase = '暂时没有用例。';
|
||||
$lang->testcase->importedCases = 'ID为 %s 的用例在相同模块已经导入,已忽略。';
|
||||
$lang->testcase->importedFromLib = '导入成功%s项:%s。';
|
||||
|
||||
$lang->testcase->searchStories = "键入来搜索{$lang->SRCommon}";
|
||||
$lang->testcase->selectLib = '请选择库';
|
||||
|
||||
@@ -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)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user