From adb6a330ea2f782e085f3da03c3136d1c12ae185 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Wed, 22 May 2024 13:19:07 +0800 Subject: [PATCH] * Fix bug #49639. --- module/search/config.php | 7 +++++++ module/search/lang/de.php | 2 ++ module/search/lang/en.php | 2 ++ module/search/lang/fr.php | 2 ++ module/search/lang/zh-cn.php | 2 ++ module/search/tao.php | 6 +++--- 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/module/search/config.php b/module/search/config.php index c6c3655f0b..a087e45443 100644 --- a/module/search/config.php +++ b/module/search/config.php @@ -82,6 +82,13 @@ $config->search->fields->requirement->content = 'keywords,spec,verify'; $config->search->fields->requirement->addedDate = 'openedDate'; $config->search->fields->requirement->editedDate = 'lastEditedDate'; +$config->search->fields->epic = new stdclass(); +$config->search->fields->epic->id = 'id'; +$config->search->fields->epic->title = 'title'; +$config->search->fields->epic->content = 'keywords,spec,verify'; +$config->search->fields->epic->addedDate = 'openedDate'; +$config->search->fields->epic->editedDate = 'lastEditedDate'; + $config->search->fields->task = new stdclass(); $config->search->fields->task->id = 'id'; $config->search->fields->task->title = 'name'; diff --git a/module/search/lang/de.php b/module/search/lang/de.php index e0f6a4fe07..b23ed3a6f0 100644 --- a/module/search/lang/de.php +++ b/module/search/lang/de.php @@ -101,10 +101,12 @@ $lang->search->modules['project'] = $lang->projectCommon; $lang->search->modules['execution'] = $lang->execution->common; $lang->search->modules['story'] = $lang->SRCommon; $lang->search->modules['requirement'] = $lang->URCommon; +$lang->search->modules['epic'] = $lang->ERCommon; $lang->search->modules['aiapp'] = 'AI'; $lang->search->objectTypeList['story'] = $lang->SRCommon; $lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['epic'] = $lang->ERCommon; $lang->search->objectTypeList['stage'] = 'stage'; $lang->search->objectTypeList['sprint'] = $lang->execution->common; $lang->search->objectTypeList['kanban'] = 'kanban'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 9a4c6341a4..8cc71b5245 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -101,10 +101,12 @@ $lang->search->modules['project'] = $lang->projectCommon; $lang->search->modules['execution'] = $lang->execution->common; $lang->search->modules['story'] = $lang->SRCommon; $lang->search->modules['requirement'] = $lang->URCommon; +$lang->search->modules['epic'] = $lang->ERCommon; $lang->search->modules['aiapp'] = 'AI'; $lang->search->objectTypeList['story'] = $lang->SRCommon; $lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['epic'] = $lang->ERCommon; $lang->search->objectTypeList['stage'] = 'stage'; $lang->search->objectTypeList['sprint'] = $lang->execution->common; $lang->search->objectTypeList['kanban'] = 'kanban'; diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php index ac7c0e58a9..cac84edc01 100644 --- a/module/search/lang/fr.php +++ b/module/search/lang/fr.php @@ -101,10 +101,12 @@ $lang->search->modules['project'] = $lang->projectCommon; $lang->search->modules['execution'] = $lang->execution->common; $lang->search->modules['story'] = $lang->SRCommon; $lang->search->modules['requirement'] = $lang->URCommon; +$lang->search->modules['epic'] = $lang->ERCommon; $lang->search->modules['aiapp'] = 'AI'; $lang->search->objectTypeList['story'] = $lang->SRCommon; $lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['epic'] = $lang->ERCommon; $lang->search->objectTypeList['stage'] = 'stage'; $lang->search->objectTypeList['sprint'] = $lang->execution->common; $lang->search->objectTypeList['kanban'] = 'kanban'; diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index 6dc43fe290..243bb4115f 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -101,10 +101,12 @@ $lang->search->modules['project'] = $lang->projectCommon; $lang->search->modules['execution'] = $lang->execution->common; $lang->search->modules['story'] = $lang->SRCommon; $lang->search->modules['requirement'] = $lang->URCommon; +$lang->search->modules['epic'] = $lang->ERCommon; $lang->search->modules['aiapp'] = 'AI'; $lang->search->objectTypeList['story'] = $lang->SRCommon; $lang->search->objectTypeList['requirement'] = $lang->URCommon; +$lang->search->objectTypeList['epic'] = $lang->ERCommon; $lang->search->objectTypeList['stage'] = '阶段'; $lang->search->objectTypeList['sprint'] = $lang->execution->common; $lang->search->objectTypeList['kanban'] = '看板'; diff --git a/module/search/tao.php b/module/search/tao.php index 414430a0df..5cea6cc3d1 100644 --- a/module/search/tao.php +++ b/module/search/tao.php @@ -768,7 +768,7 @@ class searchTao extends searchModel if($module == 'issue') $fields = ($this->config->edition == 'max' || $this->config->edition == 'ipd') ? 'id,project,owner,lib' : 'id,project,owner'; if($module == 'project') $fields = 'id,model'; if($module == 'execution') $fields = 'id,type,project'; - if($module == 'story' || $module == 'requirement') $fields = ($this->config->edition == 'max' || $this->config->edition == 'ipd') ? 'id,type,lib' : 'id,type'; + if(in_array($module, array('story', 'requirement', 'epic'))) $fields = ($this->config->edition == 'max' || $this->config->edition == 'ipd') ? 'id,type,lib' : 'id,type'; if(($module == 'risk' || $module == 'opportunity') && ($this->config->edition == 'max' || $this->config->edition == 'ipd')) $fields = 'id,lib'; if($module == 'doc' && ($this->config->edition == 'max' || $this->config->edition == 'ipd')) $fields = 'id,assetLib,assetLibType'; @@ -962,7 +962,7 @@ class searchTao extends searchModel if($module == 'issue') return $this->processIssueRecord($record, $objectList); if($module == 'project') return $this->processProjectRecord($record, $objectList); if($module == 'execution') return $this->processExecutionRecord($record, $objectList); - if($module == 'story' || $module == 'requirement') return $this->processStoryRecord($record, $module, $objectList); + if(in_array($module, array('story', 'requirement', 'epic'))) return $this->processStoryRecord($record, $module, $objectList); if(($module == 'risk' || $module == 'opportunity') && ($this->config->edition == 'max' || $this->config->edition == 'ipd')) return $this->processRiskRecord($record, $module, $objectList); if($module == 'doc' && ($this->config->edition == 'max' || $this->config->edition == 'ipd')) return $this->processDocRecord($record, $objectList); @@ -1045,7 +1045,7 @@ class searchTao extends searchModel } $module = 'story'; - $method = 'view'; + $method = 'storyView'; if(!empty($story->lib)) { $module = 'assetlib';