From a603cb92b95ad7eab31b718403ddef77ef6f994d Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Fri, 4 Mar 2022 11:00:54 +0800 Subject: [PATCH 1/3] * fix bug 20234 --- extension/lite/action/ext/lang/en/lite.php | 9 +++++++++ extension/lite/action/ext/lang/zh-cn/lite.php | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/extension/lite/action/ext/lang/en/lite.php b/extension/lite/action/ext/lang/en/lite.php index 6adf7b1d13..f07137c168 100644 --- a/extension/lite/action/ext/lang/en/lite.php +++ b/extension/lite/action/ext/lang/en/lite.php @@ -15,6 +15,15 @@ unset($lang->action->dynamicAction->case); unset($lang->action->dynamicAction->testreport); unset($lang->action->dynamicAction->testsuite); unset($lang->action->dynamicAction->caselib); +unset($lang->action->dynamicAction->issue); +unset($lang->action->dynamicAction->risk); +unset($lang->action->dynamicAction->opportunity); +unset($lang->action->dynamicAction->researchplan); +unset($lang->action->dynamicAction->researchreport); +unset($lang->action->dynamicAction->meeting); +unset($lang->action->dynamicAction->auditplan); +unset($lang->action->dynamicAction->pssp); +unset($lang->action->dynamicAction->nc); $lang->action->dynamicAction->task = array(); $lang->action->dynamicAction->task['opened'] = 'Create Task'; diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php index bedbda2bb6..bd7bf502da 100644 --- a/extension/lite/action/ext/lang/zh-cn/lite.php +++ b/extension/lite/action/ext/lang/zh-cn/lite.php @@ -15,6 +15,15 @@ unset($lang->action->dynamicAction->case); unset($lang->action->dynamicAction->testreport); unset($lang->action->dynamicAction->testsuite); unset($lang->action->dynamicAction->caselib); +unset($lang->action->dynamicAction->issue); +unset($lang->action->dynamicAction->risk); +unset($lang->action->dynamicAction->opportunity); +unset($lang->action->dynamicAction->researchplan); +unset($lang->action->dynamicAction->researchreport); +unset($lang->action->dynamicAction->meeting); +unset($lang->action->dynamicAction->auditplan); +unset($lang->action->dynamicAction->pssp); +unset($lang->action->dynamicAction->nc); $lang->action->dynamicAction->task = array(); $lang->action->dynamicAction->task['opened'] = '创建任务'; From 23d699311d9c2b860a532045519a549a98316491 Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Fri, 4 Mar 2022 14:27:25 +0800 Subject: [PATCH 2/3] * fix bug 20022 --- extension/lite/task/ext/config/lite.php | 2 +- module/task/model.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extension/lite/task/ext/config/lite.php b/extension/lite/task/ext/config/lite.php index 58d2574de9..956b702b71 100644 --- a/extension/lite/task/ext/config/lite.php +++ b/extension/lite/task/ext/config/lite.php @@ -5,6 +5,6 @@ $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'a $config->task->datatable->fieldList['lane']['title'] = 'lane'; $config->task->datatable->fieldList['lane']['fixed'] = 'no'; -$config->task->datatable->fieldList['lane']['width'] = 'auto'; +$config->task->datatable->fieldList['lane']['width'] = '100'; $config->task->datatable->fieldList['lane']['required'] = 'no'; $config->task->datatable->fieldList['lane']['sort'] = 'no'; \ No newline at end of file diff --git a/module/task/model.php b/module/task/model.php index a2c8691cd9..da44c9d705 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3152,6 +3152,7 @@ class taskModel extends model $value = round($task->$id, 1); $title = " title='{$value} {$this->lang->execution->workHour}'"; } + if($id == 'lane') $title = " title='{$task->lane}'"; echo ""; if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('task', $task, $id); @@ -3220,7 +3221,7 @@ class taskModel extends model $this->printAssignedHtml($task, $users); break; case 'lane': - echo trim($task->lane); + echo substr($task->lane, 0, 8); break; case 'assignedDate': echo substr($task->assignedDate, 5, 11); From a2e18288cfcd68653d1f8a6c876e62a2c3bbfeab Mon Sep 17 00:00:00 2001 From: Zongjun Lan Date: Fri, 4 Mar 2022 14:31:27 +0800 Subject: [PATCH 3/3] * fix bug 20022 --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index da44c9d705..d93df65c65 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3221,7 +3221,7 @@ class taskModel extends model $this->printAssignedHtml($task, $users); break; case 'lane': - echo substr($task->lane, 0, 8); + echo mb_substr($task->lane, 0, 8); break; case 'assignedDate': echo substr($task->assignedDate, 5, 11);