diff --git a/config/zentaopms.php b/config/zentaopms.php index d8f5a4e1ad..528edaf4d0 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -312,6 +312,7 @@ $config->openMethods[] = 'system.editdomain'; $config->openMethods[] = 'doc.uploaddocs'; $config->openMethods[] = 'cron.schedule'; $config->openMethods[] = 'cron.consume'; +$config->openMethods[] = 'caselib.importfromlib'; $config->openModules = array(); $config->openModules[] = 'install'; diff --git a/module/caselib/control.php b/module/caselib/control.php index c07ca9560d..34a4649497 100644 --- a/module/caselib/control.php +++ b/module/caselib/control.php @@ -560,6 +560,28 @@ class caselib extends control $this->display(); } + /** + * Import case from lib to caseLib. + * + * @param int $productID + * @param int $branch + * @param int $libID + * @param string $orderBy + * @param string $browseType + * @param int $queryID + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID + * @param int $projectID + * @param bool $toLib + * @access public + * @return void + */ + public function importFromLib($productID, $branch = 0, $libID = 0, $orderBy = 'id_desc', $browseType = '', $queryID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0, $toLib = true) + { + echo $this->fetch('testcase', 'importFromLib', "productID=$productID&libID=$libID&branch=$branch&orderBy=$orderBy&browseType=$browseType&queryID=$queryID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID&toLib=$toLib"); + } + /** * Show import case. * diff --git a/module/caselib/view/browse.html.php b/module/caselib/view/browse.html.php index c4d6dc0b76..c888dc56a5 100644 --- a/module/caselib/view/browse.html.php +++ b/module/caselib/view/browse.html.php @@ -59,7 +59,17 @@ js::set('flow', $config->global->flow); ?>
" . $lang->caselib->exportTemplate, '', "class='btn btn-link export' data-width='40%'");?> - " . $lang->testcase->fileImport, '', "class='btn btn-link export'");?> +
+ + +
createLink('caselib', 'create'), " " . $lang->caselib->create, '', 'class="btn btn-secondary"');?>
diff --git a/module/testcase/control.php b/module/testcase/control.php index c7a5490f27..1b99365b16 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -244,6 +244,12 @@ class testcase extends control } } + $sceneCases = array_merge($scenes, $cases); + if($browseType == 'bysearch') + { + $sceneCases = $this->testcase->processSearchedData($scenes, $cases); + } + /* Assign. */ $tree = $moduleID ? $this->tree->getByID($moduleID) : ''; $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common; @@ -266,7 +272,7 @@ class testcase extends control $this->view->browseType = $browseType; $this->view->param = $param; $this->view->caseType = $caseType; - $this->view->cases = array_merge($scenes, $cases); + $this->view->cases = $sceneCases; $this->view->branch = (!empty($product) and $product->type != 'normal') ? $branch : 0; $this->view->branchOption = $branchOption; $this->view->branchTagOption = $branchTagOption; @@ -2064,7 +2070,7 @@ class testcase extends control } /** - * Import case from lib. + * Import case from lib to cases or to caseLib. * * @param int $productID * @param int $branch @@ -2073,21 +2079,27 @@ class testcase extends control * @param int $recTotal * @param int $recPerPage * @param int $pageID + * @param bool $toLib * @access public * @return void */ - public function importFromLib($productID, $branch = 0, $libID = 0, $orderBy = 'id_desc', $browseType = '', $queryID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0) + public function importFromLib($productID, $branch = 0, $libID = 0, $orderBy = 'id_desc', $browseType = '', $queryID = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0, $toLib = false) { $browseType = strtolower($browseType); $queryID = (int)$queryID; - $product = $this->loadModel('product')->getById($productID); + $product = $productID ? $this->loadModel('product')->getById($productID) : 0; $branches = array(); if($branch == '') $branch = 0; $this->loadModel('branch'); - if($product->type != 'normal') $branches = array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active', $projectID); + if(!$toLib && $product->type != 'normal') $branches = array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active', $projectID); $libraries = $this->loadModel('caselib')->getLibraries(); + if($toLib) + { + $currentLib = $this->session->caseLib; + unset($libraries[$currentLib]); + } if(empty($libraries)) { echo js::alert($this->lang->testcase->noLibrary); @@ -2097,14 +2109,14 @@ class testcase extends control if($_POST) { - $this->testcase->importFromLib($productID, $libID, $branch); + $this->testcase->importFromLib($productID, $libID, $branch, $toLib ? $currentLib : 0); return print(js::reload('parent')); } $this->app->tab == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch); /* Build the search form. */ - $actionURL = $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch&libID=$libID&orderBy=$orderBy&browseType=bySearch&queryID=myQueryID"); + $actionURL = $this->createLink($toLib ? 'caselib' : 'testcase', 'importFromLib', "productID=$productID&branch=$branch&libID=$libID&orderBy=$orderBy&browseType=bySearch&queryID=myQueryID"); $this->config->testcase->search['module'] = 'testsuite'; $this->config->testcase->search['onMenuBar'] = 'no'; $this->config->testcase->search['actionURL'] = $actionURL; @@ -2119,7 +2131,7 @@ class testcase extends control $this->loadModel('testsuite'); foreach($branches as $branchID => $branchName) $canImportModules[$branchID] = $this->testsuite->getCanImportModules($productID, $libID, $branchID); - if(empty($branches)) $canImportModules[0] = $this->testsuite->getCanImportModules($productID, $libID, 0); + if(empty($branches)) $canImportModules[0] = $this->testsuite->getCanImportModules($productID, $libID, 0, $toLib ? $currentLib : 0); /* Load pager. */ $this->app->loadClass('pager', $static = true); @@ -2141,6 +2153,7 @@ class testcase extends control $this->view->browseType = $browseType; $this->view->queryID = $queryID; $this->view->canImportModules = $canImportModules; + $this->view->toLib = $toLib; $this->display(); } diff --git a/module/testcase/js/importfromlib.js b/module/testcase/js/importfromlib.js index 054105cd5f..ffde58db19 100644 --- a/module/testcase/js/importfromlib.js +++ b/module/testcase/js/importfromlib.js @@ -32,7 +32,7 @@ $(function() */ function reload(libID) { - link = createLink('testcase','importFromLib','productID='+ productID + '&branch=' + branch + '&libID='+libID); + link = createLink(module,'importFromLib','productID='+ productID + '&branch=' + branch + '&libID='+libID); location.href = link; } diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 8791655ed5..de8c06c985 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -195,7 +195,6 @@ $lang->testcase->reviewList[0] = 'Nein'; $lang->testcase->reviewList[1] = 'Ja'; $lang->testcase->autoList = array(); -$lang->testcase->autoList[''] = ''; $lang->testcase->autoList['auto'] = 'Yes'; $lang->testcase->autoList['no'] = 'No'; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 40f3d8b636..800725869c 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -195,7 +195,6 @@ $lang->testcase->reviewList[0] = 'NO'; $lang->testcase->reviewList[1] = 'YES'; $lang->testcase->autoList = array(); -$lang->testcase->autoList[''] = ''; $lang->testcase->autoList['auto'] = 'Yes'; $lang->testcase->autoList['no'] = 'No'; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index 85f239f012..cfb8b1210d 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -195,7 +195,6 @@ $lang->testcase->reviewList[0] = 'NON'; $lang->testcase->reviewList[1] = 'OUI'; $lang->testcase->autoList = array(); -$lang->testcase->autoList[''] = ''; $lang->testcase->autoList['auto'] = 'Yes'; $lang->testcase->autoList['no'] = 'No'; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 359ec37c7b..290f0d3a1f 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -195,7 +195,6 @@ $lang->testcase->reviewList[0] = '否'; $lang->testcase->reviewList[1] = '是'; $lang->testcase->autoList = array(); -$lang->testcase->autoList[''] = ''; $lang->testcase->autoList['auto'] = '是'; $lang->testcase->autoList['no'] = '否'; diff --git a/module/testcase/model.php b/module/testcase/model.php index 3971ec56c9..651ddb5ce5 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -666,7 +666,7 @@ class testcaseModel extends model ->beginIF($this->app->tab == 'project' and $this->config->systemMode == 'new')->andWhere('t2.project')->eq($this->session->project)->fi() ->beginIF($this->app->tab == 'project' and !empty($productID) and $queryProductID != 'all')->andWhere('t2.product')->eq($productID)->fi() ->beginIF($this->app->tab != 'project' and !empty($productID) and $queryProductID != 'all')->andWhere('t1.product')->eq($productID)->fi() - ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() + ->beginIF($auto != 'unit' && strpos($caseQuery, "`auto` = '") === false)->andWhere('t1.auto')->ne('unit')->fi() ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi() ->andWhere('t1.deleted')->eq(0) ->orderBy($orderBy)->page($pager)->fetchAll('id'); @@ -1899,10 +1899,11 @@ class testcaseModel extends model * @param int $productID * @param int $libID * @param int $branch + * @param int $toLib * @access public * @return void */ - public function importFromLib($productID, $libID, $branch) + public function importFromLib($productID, $libID, $branch, $toLib = 0) { $data = fixer::input('post')->get(); @@ -1927,7 +1928,7 @@ class testcaseModel extends model } else { - $caseModules[$branch] = $this->loadModel('testsuite')->getCanImportModules($productID, $libID, $branch); + $caseModules[$branch] = $this->loadModel('testsuite')->getCanImportModules($productID, $libID, $branch, $toLib); } $libCases = $this->dao->select('*')->from(TABLE_CASE)->where('deleted')->eq(0)->andWhere('id')->in($data->caseIdList)->fetchAll('id'); @@ -1951,6 +1952,7 @@ class testcaseModel extends model continue; } + if($toLib) $case->lib = $toLib; $this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->exec(); if(dao::isError()) continue; @@ -4318,4 +4320,47 @@ class testcaseModel extends model // Return node as array return array($xml->getName() => $propertiesArray); } + + /** + * Process searched data. + * + * @param array $scenes + * @param array $cases + * @access public + * @return array + */ + public function processSearchedData($scenes, $cases) + { + $casePairs = array(); + foreach($cases as $case) $casePairs[$case->id] = $case; + + $this->processScenes($scenes, $casePairs); + + foreach($cases as $key => $case) + { + if($case->scene) unset($cases[$key]); + } + + return array_merge($scenes, $cases); + } + + /** + * Process searched scenes data. + * + * @param int $scenes + * @param int $casePairs + * @access public + * @return void + */ + public function processScenes($scenes, $casePairs) + { + foreach($scenes as $scene) + { + foreach($scene->cases as $key => $value) + { + if(!isset($casePairs[$key])) unset($scene->cases[$key]); + } + if(!empty($scene->children)) $this->processScenes($scene->children, $casePairs); + } + } } diff --git a/module/testcase/view/importfromlib.html.php b/module/testcase/view/importfromlib.html.php index 57b3a9dba8..3e962446ba 100644 --- a/module/testcase/view/importfromlib.html.php +++ b/module/testcase/view/importfromlib.html.php @@ -14,6 +14,7 @@ global->flow);?> testcase->ditto);?> +app->rawModule);?>