diff --git a/module/testcase/model.php b/module/testcase/model.php index 125ee96e4d..a69c10f514 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -28,20 +28,7 @@ class testcaseModel extends model public function setMenu($products, $productID, $branch = 0, $moduleID = 0, $suiteID = 0, $orderBy = 'id_desc') { $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'case'); - $selectHtml = $this->product->select($products, $productID, 'testcase', 'browse', '', $branch, $moduleID, 'case'); - $pageNav = ''; - $pageActions = ''; - $isMobile = $this->app->viewType == 'mhtml'; - if($isMobile) - { - $this->app->loadLang('qa'); - $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; - } - $pageNav .= $selectHtml; - - $this->lang->modulePageNav = $pageNav; - $this->lang->TRActions = $pageActions; foreach($this->lang->testcase->menu as $key => $menu) { if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID); diff --git a/module/testreport/model.php b/module/testreport/model.php index c056675f9f..ebb194fb2d 100644 --- a/module/testreport/model.php +++ b/module/testreport/model.php @@ -23,16 +23,7 @@ class testreportModel extends model public function setMenu($products, $productID, $branch = 0) { $this->loadModel('product')->setMenu($products, $productID, $branch); - $selectHtml = $this->product->select($products, $productID, 'testreport', 'browse', $this->session->PRJ, $branch); - /* Remove branch. */ - if(strpos($selectHtml, 'currentBranch') !== false) $selectHtml = substr($selectHtml, 0, strrpos($selectHtml, "
")) . '
'; - - $pageNav = $selectHtml; - $pageActions = ''; - - $this->lang->modulePageNav = $pageNav; - $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { if($this->lang->navGroup->testreport != 'qa') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID); diff --git a/module/testsuite/model.php b/module/testsuite/model.php index 276a88a081..6f67660d4e 100644 --- a/module/testsuite/model.php +++ b/module/testsuite/model.php @@ -24,21 +24,7 @@ class testsuiteModel extends model public function setMenu($products, $productID) { $this->loadModel('product')->setMenu($products, $productID); - $selectHtml = $this->select($products, $productID, 'testsuite', 'browse'); - if(strpos($selectHtml, 'currentBranch') !== false) $selectHtml = substr($selectHtml, 0, strrpos($selectHtml, "
")) . '
'; - $pageNav = ''; - $pageActions = ''; - $isMobile = $this->app->viewType == 'mhtml'; - if($isMobile) - { - $this->app->loadLang('qa'); - $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; - } - $pageNav .= $selectHtml; - - $this->lang->modulePageNav = $pageNav; - $this->lang->TRActions = $pageActions; foreach($this->lang->testsuite->menu as $key => $value) { if($this->config->global->flow == 'full' and $this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID); diff --git a/module/testtask/model.php b/module/testtask/model.php index d928652e23..e9f2a8ec35 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -24,42 +24,8 @@ class testtaskModel extends model public function setMenu($products, $productID, $branch = 0, $testtask = 0) { $this->loadModel('product')->setMenu($products, $productID, $branch); - $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch); - - if($testtask and $this->app->viewType != 'mhtml') - { - $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'), 0, 0, $this->session->PRJ); - if(!isset($testtasks[$testtask])) $testtasks[$testtask] = $this->getById($testtask); - - $selectHtml .= "
"; - $selectHtml .= "
"; - $selectHtml .= "" . $testtasks[$testtask]->name . " "; - $selectHtml .= ""; - $selectHtml .= "
"; - $selectHtml .= "
"; - - $this->lang->TRActions = ''; - if(common::hasPriv('testtask', 'view')) $this->lang->TRActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), " " . $this->lang->testtask->view, '', "class='btn'"); - if(common::hasPriv('testreport', 'browse')) $this->lang->TRActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), " " . $this->lang->testtask->reportField, '', "class='btn'"); - } $this->app->loadLang('qa'); - $productIndex = $selectHtml; - - $pageNav = ''; - $pageActions = ''; - $isMobile = $this->app->viewType == 'mhtml'; - if($isMobile) - { - $this->app->loadLang('qa'); - $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; - } - $pageNav .= $selectHtml; - - $this->lang->modulePageNav = $pageNav; - $this->lang->TRActions = $pageActions; foreach($this->lang->testtask->menu as $key => $value) { if($this->lang->navGroup->testtask != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID); @@ -93,48 +59,7 @@ class testtaskModel extends model public function setUnitMenu($products, $productID, $branch = 0, $testtask = 0) { $this->loadModel('product')->setMenu($products, $productID, $branch); - $selectHtml = $this->product->select($products, $productID, 'testtask', 'browseUnits', '', $branch); - if($testtask and $this->app->viewType != 'mhtml') - { - $testtasks = $this->getProductUnitTasks($productID, 'all', 'id_desc'); - if(!isset($testtasks[$testtask])) $testtasks[$testtask] = $this->getById($testtask); - - $selectHtml .= "
"; - $selectHtml .= "
"; - $selectHtml .= "" . $testtasks[$testtask]->name . " "; - $selectHtml .= ""; - $selectHtml .= "
"; - $selectHtml .= "
"; - } - - $this->app->loadLang('qa'); - $productIndex = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; - $productIndex .= $selectHtml; - - $pageNav = ''; - $pageActions = ''; - $isMobile = $this->app->viewType == 'mhtml'; - if($isMobile) - { - $this->app->loadLang('qa'); - $pageNav = html::a(helper::createLink('qa', 'index'), $this->lang->qa->index) . $this->lang->colon; - } - else - { - if($this->config->global->flow == 'full') - { - $this->app->loadLang('qa'); - $pageNav = '
' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '
'; - } - } - $pageNav .= $selectHtml; - - $this->lang->modulePageNav = $pageNav; - $this->lang->TRActions = $pageActions; - if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass(); foreach($this->lang->testtask->menu as $key => $value) { if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);