diff --git a/module/block/control.php b/module/block/control.php index b15959a9c6..15287825bd 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -253,11 +253,11 @@ class block extends control /* The list assigned to me jumps to the work page when click more button. */ $block->moreLink = $this->createLink($moduleName, $method, $vars); - if($moduleName = 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method)) + if($moduleName == 'my' and strpos('task|story|requirement|bug|testcase|testtask|issue|risk', $method)) { $block->moreLink = $this->createLink($moduleName, 'work', 'mode=' . $method . '&' . $vars); } - elseif($moduleName = 'project') + elseif($moduleName == 'project') { $block->moreLink = $this->createLink('project', 'dynamic', "projectID={$this->session->project}"); } diff --git a/module/testtask/control.php b/module/testtask/control.php index a20e55cb50..8490486a3f 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -144,7 +144,7 @@ class testtask extends control $this->app->loadLang('tree'); /* Set menu. */ - $productID = $this->product->saveState($productID, $this->products); + $productID = $this->loadModel('product')->saveState($productID, $this->products); if($this->app->openApp == 'project') { $this->loadModel('project')->setMenu($this->session->project); @@ -1259,7 +1259,7 @@ class testtask extends control $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); + $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID); $builds = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk'); $this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->importUnitResult;