From 4d46cb2ca9e7e564bd5b4336874d976c8b919ba4 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Thu, 24 Aug 2023 16:30:32 +0800 Subject: [PATCH] * Fix typo, cencel to cancel. --- module/task/model.php | 2 +- module/task/ui/assignto.html.php | 2 +- module/task/view/assignto.html.php | 4 ++-- module/task/view/view.html.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index ca65b6626a..845e7bb534 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2440,7 +2440,7 @@ class taskModel extends model $myself = new self(); if($task->mode == 'linear') { - if($action == 'assignto' && !in_array($task->status, array('done', 'cencel', 'closed'))) return false; + if($action == 'assignto' && !in_array($task->status, array('done', 'cancel', 'closed'))) return false; if($action == 'start' && in_array($task->status, array('wait', 'doing'))) { if($task->assignedTo != $app->user->account) return false; diff --git a/module/task/ui/assignto.html.php b/module/task/ui/assignto.html.php index 17b8670544..1a376d44a2 100644 --- a/module/task/ui/assignto.html.php +++ b/module/task/ui/assignto.html.php @@ -26,7 +26,7 @@ formPanel set::width("1/3"), set::name("assignedTo"), set::label($lang->task->assignedTo), - set::value((empty($task->team) or strpos('done,cencel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser), + set::value((empty($task->team) or strpos('done,cancel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser), set::control("picker"), set::items($members) ), diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index c03f180f02..7ffe95793c 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -38,8 +38,8 @@
- - + + status != 'done' and $task->status != 'closed' and $task->parent >= 0):?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index f48ff7cc79..ebf4760d88 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -255,7 +255,7 @@
team) or strpos('done,cencel,closed', $task->status) !== false) ? $lang->task->assign : $lang->task->transferTo;?>team) or strpos('done,cencel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?>team) or strpos('done,cancel,closed', $task->status) !== false) ? $lang->task->assign : $lang->task->transferTo;?>team) or strpos('done,cancel,closed', $task->status) !== false) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?>
task->assignedTo;?> team) and $task->mode == 'multi' and strpos('done,cencel,closed', $task->status) === false) + if(!empty($task->team) and $task->mode == 'multi' and strpos('done,cancel,closed', $task->status) === false) { foreach($task->team as $member) echo ' ' . zget($users, $member->account); }