my->preference;?>

- -
-
-
- my->preference;?> -
-
@@ -73,8 +56,4 @@ html,body {height: 100%;}
- - - - diff --git a/module/qa/model.php b/module/qa/model.php index f807bbce06..a89af42d0d 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -37,6 +37,7 @@ class qaModel extends model if(!in_array($this->app->rawModule, $this->config->qa->noDropMenuModule)) $this->lang->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch); if($this->app->rawModule == 'product' and $this->app->rawMethod == 'showerrornone') $this->lang->switcherMenu = ''; + if(!common::hasPriv('zahost', 'browse') and !common::hasPriv('zanode', 'browse')) unset($this->lang->qa->menu->automation); common::setMenuVars('qa', $productID); } diff --git a/module/search/model.php b/module/search/model.php index 4768535735..1021d77782 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -1010,7 +1010,6 @@ class searchModel extends model $programs = $this->app->user->view->programs; $projects = $this->app->user->view->projects; $executions = $this->app->user->view->sprints; - $grantProducts = $this->loadModel('feedback')->getGrantProducts(); $objectPairs = array(); $total = count($results); @@ -1025,7 +1024,7 @@ class searchModel extends model $objectExecutions = array(); if(!isset($this->config->objectTables[$objectType])) continue; $table = $this->config->objectTables[$objectType]; - if(strpos(',bug,case,testcase,productplan,release,story,testtask,ticket,', ",$objectType,") !== false) + if(strpos(',bug,case,testcase,productplan,release,story,testtask,', ",$objectType,") !== false) { $objectProducts = $this->dao->select('id,product')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('product', 'id'); } @@ -1132,15 +1131,17 @@ class searchModel extends model } } } - elseif($objectType == 'feedback') + elseif(strpos(',feedback,ticket,', ",$objectType,") !== false) { - $objectFeedbacks = $this->dao->select('*')->from($table)->where('id')->in(array_keys($objectIdList))->fetchAll('id'); - foreach($objectFeedbacks as $feedbackID => $feedback) + $grantProducts = $this->loadModel('feedback')->getGrantProducts(); + $objects = $this->dao->select('*')->from($table)->where('id')->in(array_keys($objectIdList))->fetchAll('id'); + foreach($objects as $objectID => $object) { - if($feedback->openedBy == $this->app->user->account or isset($grantProducts[$feedback->product])) continue; - if(isset($objectIdList[$feedbackID])) + if($objectType == 'feedback' and $object->openedBy == $this->app->user->account) continue; + if(isset($grantProducts[$object->product])) continue; + if(isset($objectIdList[$objectID])) { - $recordID = $objectIdList[$feedbackID]; + $recordID = $objectIdList[$objectID]; unset($results[$recordID]); } } @@ -1149,7 +1150,7 @@ class searchModel extends model foreach($objectProducts as $productID => $idList) { if(empty($productID)) continue; - if(strpos(",$products,", ",$productID,") === false or ($objectType == 'ticket' and !isset($grantProducts[$productID]))) + if(strpos(",$products,", ",$productID,") === false) { foreach($idList as $object) { diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index ad1a3eb851..2c76b79622 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -360,7 +360,7 @@ class sonarqube extends control if($search == true) $keyword = $this->session->sonarqubeIssueKeyword; } - ini_set('memory_limit', '256M'); + ini_set('memory_limit', '1024M'); $cacheFile = $this->sonarqube->getCacheFile($sonarqubeID, $projectKey); if(!$cacheFile or !file_exists($cacheFile) or (time() - filemtime($cacheFile)) / 60 > $this->config->sonarqube->cacheTime) diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php index 1dc1b30fb6..662ef81bce 100644 --- a/module/testcase/view/browse.html.php +++ b/module/testcase/view/browse.html.php @@ -78,7 +78,7 @@ js::set('cancelURL', $this->createLink('testtask', 'batchRun', "productID=$
recTotal}&recPerPage={$pager->recPerPage}"; + $vars = $projectParam . "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&caseType=$caseType&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; if($useDatatable) include '../../common/view/datatable.html.php'; else include '../../common/view/tablesorter.html.php'; diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index 5af3600645..64c1d2a33d 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -69,7 +69,7 @@ } else { - echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=$param&caseType=$type"), $typeName); + echo html::a($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=all¶m=$param&caseType=$type"), $typeName); } echo "