From 27a84578941de74bf5252420146513f27cf0eeb8 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 30 Sep 2022 13:10:02 +0800 Subject: [PATCH 1/2] * Fix bug #28241. --- module/productplan/css/view.css | 1 + module/productplan/js/view.js | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/module/productplan/css/view.css b/module/productplan/css/view.css index 3329905f6d..cffbb1ac2d 100644 --- a/module/productplan/css/view.css +++ b/module/productplan/css/view.css @@ -32,3 +32,4 @@ ol, ul {padding-left: 20px;} #mainMenu .btn-toolbar .page-title .label {top: 9px; margin-right: 10px; height: 16px;} #mainMenu .btn-toolbar .page-title .text {max-width: 434px; overflow: hidden; white-space:nowrap; margin-right: 6px;} #actionsBox a:last-of-type + .divider {display: none;} +#actionsBox div.divider:first-child {display: none;} diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js index 7c184c6d0e..012a26ee42 100644 --- a/module/productplan/js/view.js +++ b/module/productplan/js/view.js @@ -44,8 +44,6 @@ function loadURL(url, type) $(function() { - $('#actionsBox a').first().prevAll('.divider').hide(); - /* Recalculate the maximum width of the title. */ var maxWidth = $('#mainMenu').width() - $('#actionsBox').width() - $('#mainMenu .btn-toolbar .page-title .label-info').width() - 177; $('#mainMenu .btn-toolbar .page-title .text').css('max-width', maxWidth.toString() + 'px'); From e43a0cfab7186d2267b77f80de241fcb0f508ba7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 30 Sep 2022 13:14:34 +0800 Subject: [PATCH 2/2] * Finish task #70505. --- module/testcase/config.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module/testcase/config.php b/module/testcase/config.php index 1b91760ca6..1243f70e7e 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -181,16 +181,16 @@ $config->testcase->datatable->fieldList['lastRunner']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastRunner']['width'] = '70'; $config->testcase->datatable->fieldList['lastRunner']['required'] = 'no'; -$config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult'; -$config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70'; -$config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no'; - $config->testcase->datatable->fieldList['lastRunDate']['title'] = 'lastRunDate'; $config->testcase->datatable->fieldList['lastRunDate']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastRunDate']['width'] = '90'; $config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no'; +$config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult'; +$config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no'; +$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70'; +$config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no'; + $config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy'; $config->testcase->datatable->fieldList['lastEditedBy']['fixed'] = 'no'; $config->testcase->datatable->fieldList['lastEditedBy']['width'] = '92';