my->preference;?>

- -
-
-
- my->preference;?> -
-
@@ -73,8 +56,4 @@ html,body {height: 100%;}
- - - - diff --git a/module/repo/control.php b/module/repo/control.php index b950f13e0b..327adc59aa 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -425,6 +425,11 @@ class repo extends control if($this->get->repoPath) $entry = $this->get->repoPath; $this->repo->setBackSession('view', $withOtherModule = true); if($repoID == 0) $repoID = $this->session->repoID; + if($revision != 'HEAD') + { + setCookie("repoBranch", $revision, $this->config->cookieLife, $this->config->webRoot, '', false, true); + $this->cookie->set('repoBranch', $revision); + } $this->commonAction($repoID, $objectID); if($browser['name'] != 'ie') return print($this->fetch('repo', 'monaco', "repoID=$repoID&objectID=$objectID&entry=$entry&revision=$revision&showBug=$showBug&encoding=$encoding")); diff --git a/module/screen/model.php b/module/screen/model.php index 259d62c235..8d9f970af9 100644 --- a/module/screen/model.php +++ b/module/screen/model.php @@ -374,7 +374,7 @@ class screenModel extends model if($settings->value->type === 'value') { - $value = $results[0]->$field; + $value = empty($results[0]) ? 0 : $results[0]->$field; } if($settings->value->agg === 'count') { @@ -829,6 +829,9 @@ class screenModel extends model { $execution = $this->execution->getByID($executionID); + /* Splice project name for the execution name. */ + $execution->name = $this->loadModel('project')->getByID($execution->project)->name . '--' . $execution->name; + /* Get date list. */ if(((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end) diff --git a/module/screen/view/burn.html.php b/module/screen/view/burn.html.php index 67dd2d30d9..0b41b365c4 100644 --- a/module/screen/view/burn.html.php +++ b/module/screen/view/burn.html.php @@ -35,7 +35,8 @@ function initBurnChar() title: { text: execution.name, textStyle: { - color: '#a1c4e9' + color: '#a1c4e9', + fontSize: 15 } }, tooltip: { 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/story/view/view.html.php b/module/story/view/view.html.php index b22268c33e..722f66a928 100644 --- a/module/story/view/view.html.php +++ b/module/story/view/view.html.php @@ -486,7 +486,7 @@ } foreach($story->executions as $executionID => $execution) { - if(isset($story->tasks[$executionID])) continue; + if(!isset($executions[$executionID]) or isset($story->tasks[$executionID])) continue; $execName = ($execution->type == 'kanban' and isonlybody()) ? $executions[$executionID] : html::a($this->createLink('execution', 'view', "executionID=$executionID"), $executions[$executionID], '', "class='text-muted'"); echo "