From cfd9e136bc07d098186cab7e9bb648580bb18ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 15 Dec 2022 10:42:45 +0800 Subject: [PATCH] * Fix bug #30878. --- module/project/js/create.js | 1 + module/project/js/edit.js | 2 ++ module/task/view/edit.html.php | 20 +++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/module/project/js/create.js b/module/project/js/create.js index 347a0406c7..8931eac1b6 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -400,6 +400,7 @@ function removeLine(obj) { $(obj).closest('tr').remove(); disableSelectedProduct(); + if($("select[name^='products']").length < 2) $('.division').addClass('hide'); } /** diff --git a/module/project/js/edit.js b/module/project/js/edit.js index d9abb1e438..c1353908a1 100644 --- a/module/project/js/edit.js +++ b/module/project/js/edit.js @@ -293,4 +293,6 @@ function addNewLine(obj) function removeLine(obj) { $(obj).closest('tr').remove(); + disableSelectedProduct(); + if($("select[name^='products']").length < 2) $('.division').addClass('hide'); } diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 111d1e2a6c..54763f1ee8 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -132,7 +132,25 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field) task->mode;?> - status == 'wait' ? html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'") : zget($lang->task->editModeList, $task->mode);?> + + status == 'wait') + { + echo html::select('mode', $lang->task->editModeList, $task->mode, "class='form-control chosen'"); + } + else + { + if($task->mode == '') + { + echo $lang->task->editModeList['single']; + } + else + { + echo zget($lang->task->editModeList, $task->mode); + } + } + ?> + task->assignedTo;?>