diff --git a/module/product/model.php b/module/product/model.php index 5382b5961c..05bdd2c10a 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1368,7 +1368,7 @@ class productModel extends model ->beginIF($branch !== '')->andWhere('t1.branch')->in($branch)->fi() ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi() ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t2.status')->ne('closed')->fi() - ->andWhere('t2.multiple', true)->eq('1')->orWhere('t2.type')->eq('project')->markright(1) + ->beginIF(strpos($mode, 'multiple') !== false)->andWhere('t2.multiple')->eq('1')->fi() ->andWhere('t2.deleted')->eq('0') ->orderBy($orderBy) ->fetchAll('id'); diff --git a/module/testtask/control.php b/module/testtask/control.php index 8f27b72633..a2116c8ad2 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -248,7 +248,7 @@ class testtask extends control /* Create testtask from testtask of test.*/ $productID = $productID ? $productID : key($this->products); - $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID, 'multiple'); + $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID); $builds = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk'); $execution = $this->loadModel('execution')->getByID($executionID); @@ -801,7 +801,7 @@ class testtask extends control /* Create testtask from testtask of test.*/ $productID = $productID ? $productID : key($this->products); $projectID = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project; - $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID, 'multiple'); + $executions = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID); $executionID = $task->execution; if($executionID) {