From fd0b3de78ede2cc24aba68cc9e2f8705e83de36c Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 29 Apr 2024 16:00:11 +0800 Subject: [PATCH] * Fix bug #48596. --- lib/zin/wg/formsettingbtn/v1.php | 3 ++- module/task/js/batchcreate.ui.js | 5 +++++ module/task/zen.php | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/zin/wg/formsettingbtn/v1.php b/lib/zin/wg/formsettingbtn/v1.php index e212f7dffc..6bfce687b5 100644 --- a/lib/zin/wg/formsettingbtn/v1.php +++ b/lib/zin/wg/formsettingbtn/v1.php @@ -43,7 +43,8 @@ class formSettingBtn extends wg set::name('fields[]'), set::value($field), set::text($text), - set::checked($showFields ? in_array($field, $showFields) : true) + set::checked($showFields ? in_array($field, $showFields) : true), + empty($text) ? set::rootClass('hidden') : null ); } return $items; diff --git a/module/task/js/batchcreate.ui.js b/module/task/js/batchcreate.ui.js index 06358a2505..57a4e03f21 100644 --- a/module/task/js/batchcreate.ui.js +++ b/module/task/js/batchcreate.ui.js @@ -165,3 +165,8 @@ function loadLanes(event) if(!$row.find('td[data-name="region"][data-ditto="on"]').length) break; } } + +$('#formSettingBtn').on('click', '.checkbox-primary [value=story]', function() +{ + $('#formSettingBtn .checkbox-primary [value=preview], #formSettingBtn .checkbox-primary [value=copyStory]').prop('checked', $('#formSettingBtn .checkbox-primary [value=story]').prop('checked')); +}) diff --git a/module/task/zen.php b/module/task/zen.php index a4996796a0..22353df0bd 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -353,6 +353,10 @@ class taskZen extends task $stories = $this->story->getExecutionStoryPairs($execution->id, 0, 'all', $story ? $story->module : 0, 'short', 'active'); list($customFields, $checkedFields) = $this->getCustomFields($execution, 'batchCreate'); + if(isset($customFields['story'])) $customFields['preview'] = $customFields['copyStory'] = ''; + + $showFields = $this->config->task->custom->batchCreateFields; + if(strpos(",$showFields,", ',story,') !== false) $showFields .= ',preview,copyStory'; $this->view->title = $this->lang->task->batchCreate; $this->view->execution = $execution; @@ -368,7 +372,7 @@ class taskZen extends task $this->view->customFields = $customFields; $this->view->checkedFields = $checkedFields; $this->view->hideStory = $this->task->isNoStoryExecution($execution); - $this->view->showFields = $this->config->task->custom->batchCreateFields; + $this->view->showFields = $showFields; $this->display(); }