From d5f6181ea3b59b3e4cbf9d4685c119e4690f1c30 Mon Sep 17 00:00:00 2001 From: zhengrunyu Date: Fri, 3 Dec 2021 13:53:53 +0800 Subject: [PATCH 1/2] *Fixbug 17066. --- module/task/css/view.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/task/css/view.css b/module/task/css/view.css index e3b77998b9..e605f6862d 100644 --- a/module/task/css/view.css +++ b/module/task/css/view.css @@ -1,3 +1,5 @@ .side-col .cell {padding: 0px;} .side-col #legendProjectAndTask .list-unstyled {padding: 10px; border: 1px solid #ddd; border-top: 0px; margin: 0px;} .tab-pane table {border: 1px solid #ddd; border-top: none;} +.page-title{max-width: 80%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} +.pull-left{max-width: 80%;} From a944ec7ccdc33d59840ae843a7e92ac67a320fb2 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 3 Dec 2021 14:46:12 +0800 Subject: [PATCH 2/2] * Fix bug#17075. --- module/bug/js/common.js | 2 +- module/build/control.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index b3db94683d..a4e7a32948 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -629,7 +629,7 @@ function notice() productID = $('#product').val(); projectID = $('#project').val(); link = createLink('build', 'create','executionID=' + executionID + '&productID=' + productID + '&projectID=' + projectID); - link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; + if(config.onlybody != 'yes') link += config.requestType == 'GET' ? '&onlybody=yes' : '?onlybody=yes'; html += '' + createBuild + ' '; html += '' + refresh + ''; } diff --git a/module/build/control.php b/module/build/control.php index d422615cb4..707bedd53f 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -44,6 +44,7 @@ class build extends control } /* Set menu. */ + $executions = array(); if($this->app->tab == 'project') { $this->loadModel('project')->setMenu($projectID); @@ -64,7 +65,7 @@ class build extends control $executions = $this->execution->getPairs($execution->project); } - $executionList = $this->execution->getByIdList(array_keys($executions)); + $executionList = empty($executions) ? array() : $this->execution->getByIdList(array_keys($executions)); foreach($executionList as $execution) { if($execution->lifetime == 'ops') unset($executions[$execution->id]);