From 27eebdc70d04b41b90bd3585551397cf56ea84fc Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 6 Jun 2025 15:43:20 +0800 Subject: [PATCH] * [bug#63191] adjust task module dislpay logic. --- module/task/lang/en.php | 2 +- module/task/zen.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index df27a2403d..fa03267a7a 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -230,7 +230,7 @@ $lang->task->typeList['study'] = 'Study'; $lang->task->typeList['discuss'] = 'Discuss'; $lang->task->typeList['ui'] = 'UI'; $lang->task->typeList['affair'] = 'Work'; -$lang->task->typeList['misc'] = 'Misc.'; +$lang->task->typeList['misc'] = 'Misc'; $lang->task->priList[0] = ''; $lang->task->priList[1] = '1'; diff --git a/module/task/zen.php b/module/task/zen.php index b679e57886..e74f2c9be1 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -2123,13 +2123,12 @@ class taskZen extends task * 处理过滤条件显示内容。 * Process filter title. * - * @param int $executionID * @param string $browseType * @param int $param * @access public * @return string */ - public function processFilterTitle(int $executionID, string $browseType, int $param): string + public function processFilterTitle(string $browseType, int $param): string { if($browseType != 'bysearch' && $browseType != 'bymodule') { @@ -2141,8 +2140,7 @@ class taskZen extends task $fieldParams = array(); $searchConfig = $this->session->tasksearchParams; if($searchConfig) $fieldParams = json_decode($searchConfig['fieldParams'], true); - if(!$fieldParams) $fieldParams = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, empty($this->config->execution->task->allModule) ? '' : 'allModule'); - if($browseType == 'bymodule') return sprintf($this->lang->task->report->tpl->search, $this->config->execution->search['fields']['module'], '=', zget($fieldParams, $param)); + if($browseType == 'bymodule') return sprintf($this->lang->task->report->tpl->search, $this->config->execution->search['fields']['module'], '=', zget($fieldParams['module']['values'], $param)); $leftConditions = array(); $rightConditions = array();