Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Refactor testsuiteModel::getCanImportCases, and add its unit test.

Browse Source
This commit is contained in:
liumengyi
2023-09-28 13:20:11 +08:00
parent 5e66ea2097
commit e604bd668e
6 changed files with 125 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testsuite/model.php
+4 -7
View File
@@ -308,20 +308,17 @@ class testsuiteModel extends model
}
else
{
if($this->session->testsuiteQuery == false) $this->session->set('testsuiteQuery', ' 1 = 1');
if($this->session->testsuiteQuery === false) $this->session->set('testsuiteQuery', ' 1 = 1');
}
$query = $this->session->testsuiteQuery;
$allLib = "`lib` = 'all'";
$withAllLib = strpos($query, $allLib) !== false;
if($withAllLib) $query = str_replace($allLib, 1, $query);
if(!$withAllLib) $query .= " AND `lib` = '$libID'";
$query = strpos($query, $allLib) !== false ? str_replace($allLib, '1 = 1', $query) : "{$query} AND `lib` = '{$libID}'";
}
$this->loadModel('branch');
$product = $this->loadModel('product')->getById($productID);
$branches = $product->type != 'normal' ? array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active') : array(0);
$product = $this->loadModel('product')->getById($productID);
$branches = $branch === 'all' && $product->type != 'normal' ? array(BRANCH_MAIN => $this->lang->branch->main) + $this->branch->getPairs($productID, 'active') : array($product->type == 'normal' ? 0 : $branch => '');
$canImport = array();
foreach($branches as $branchID => $branchName) $canImport += $this->getCanImportModules($productID, $libID, $branchID);