From c800b4101b5399b0d66cf3c449c62bf4382fd51a Mon Sep 17 00:00:00 2001 From: daitingting Date: Sun, 9 Oct 2022 05:20:29 +0000 Subject: [PATCH] * Finish task #71576,#71577,#71578,#71579. --- module/task/view/batchedit.html.php | 2 +- module/task/view/create.html.php | 2 +- module/task/view/edit.html.php | 2 +- module/task/view/view.html.php | 29 ++++++++++++++--------------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index d220b44399..b828d40a0c 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -22,7 +22,7 @@ js::set('requiredFields', $config->task->edit->requiredFields);

task->common . $lang->colon . $lang->task->batchEdit;?> - + multiple):?> task->execution . $lang->colon . ' ' . $executionName;?>

diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 43537bc878..22aa704749 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -42,7 +42,7 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
- type != 'kanban' or $this->config->vision == 'lite'):?> + type != 'kanban' or $this->config->vision == 'lite') and $execution->multiple):?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 8128645fa1..be0c12c53d 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -107,7 +107,7 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
task->legendBasic;?>
task->execution;?> id, "class='form-control chosen' onchange='loadAll(this.value)' required");?>
- parent <= 0):?> + parent <= 0 and $execution->multiple):?> diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 47e1697c39..0f63e60d17 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -182,25 +182,24 @@
task->execution;?> execution, 'class="form-control chosen" onchange="loadAll(this.value)"');?>
+ multiple):?> - config->vision == 'lite') $method = 'kanban'; - ?> + config->vision == 'lite' ? 'kanban' : 'view'; + if($execution->type != 'kanban') + { + common::printLink('execution', $method, "executionID={$task->execution}", $execution->name); + } + else + { + echo $execution->name; + } + ?> + +
task->execution;?> - type != 'kanban') - { - common::printLink('execution', $method, "executionID={$task->execution}", $execution->name); - } - else - { - echo $execution->name; - } - ?> -
task->module;?>