From 42e9076e66dc971165fb8632ffccf8374f008838 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 6 Jan 2022 15:25:09 +0800 Subject: [PATCH] * Finish task #47081 #47092 #47093 #47111. --- module/bug/model.php | 6 ++++-- module/execution/model.php | 2 +- module/project/css/group.css | 2 +- module/testtask/css/linkcase.css | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 9d8e662703..dabf556e08 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -764,8 +764,8 @@ class bugModel extends model $bug->resolution = $data->resolutions[$bugID]; $bug->duplicateBug = $data->duplicateBugs[$bugID] ? $data->duplicateBugs[$bugID] : $oldBug->duplicateBug; - if($bug->assignedTo != $oldBug->assignedTo) $bug->assignedDate = $now; - if($bug->resolution != '') $bug->confirmed = 1; + if($bug->assignedTo != $oldBug->assignedTo) $bug->assignedDate = $now; + if($bug->resolution != '') $bug->confirmed = 1; if(($bug->resolvedBy != '' or $bug->resolution != '') and $oldBug->status != 'closed') { $bug->resolvedDate = $now; @@ -2694,6 +2694,8 @@ class bugModel extends model * @param array $stories * @param array $tasks * @param string $mode + * @param array $projectPairs + * * @access public * @return void */ diff --git a/module/execution/model.php b/module/execution/model.php index cfa7be48ae..f7d9f619dc 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -1324,7 +1324,7 @@ class executionModel extends model $module = 'execution'; $method = 'testcase'; } - if($module == 'testtask' and ($method == 'view' || $method == 'create' || $method == 'edit' || $method == 'linkcase')) + if($module == 'testtask') { $module = 'execution'; $method = 'testtask'; diff --git a/module/project/css/group.css b/module/project/css/group.css index 6375b99ceb..238fd83cb1 100644 --- a/module/project/css/group.css +++ b/module/project/css/group.css @@ -1,3 +1,3 @@ .c-id {width: 60px;} -.c-name {width: 130px;} +.c-name {width: 300px;} .c-desc {width: 300px;} diff --git a/module/testtask/css/linkcase.css b/module/testtask/css/linkcase.css index 02b3b0cf79..1f88dd1a70 100644 --- a/module/testtask/css/linkcase.css +++ b/module/testtask/css/linkcase.css @@ -1,3 +1,5 @@ td.title {overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} .main-table .table-header {box-shadow: none;} .c-version, .c-result {width: 80px;} + +#bysearchTab .icon-search {margin-right:3px;}