From a49076b0d8a6c1caf56b75d74bde3917f4cfdf6d Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 17 Jan 2022 10:14:50 +0800
Subject: [PATCH] * Fix bug #18407.

---
 module/search/lang/en.php    | 1 +
 module/search/lang/zh-cn.php | 1 +
 module/search/model.php      | 9 ++++++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/module/search/lang/en.php b/module/search/lang/en.php
index 14e0710118..78e4db7e8f 100644
--- a/module/search/lang/en.php
+++ b/module/search/lang/en.php
@@ -98,5 +98,6 @@ $lang->search->objectTypeList['story']            = $lang->SRCommon;
 $lang->search->objectTypeList['requirement']      = $lang->URCommon;
 $lang->search->objectTypeList['stage']            = 'stage';
 $lang->search->objectTypeList['sprint']           = $lang->executionCommon;
+$lang->search->objectTypeList['kanban']           = 'kanban';
 $lang->search->objectTypeList['commonIssue']      = 'Issue';
 $lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue';
diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php
index 5ec2f1b0ca..c7d5f00f49 100644
--- a/module/search/lang/zh-cn.php
+++ b/module/search/lang/zh-cn.php
@@ -98,5 +98,6 @@ $lang->search->objectTypeList['story']            = $lang->SRCommon;
 $lang->search->objectTypeList['requirement']      = $lang->URCommon;
 $lang->search->objectTypeList['stage']            = '阶段';
 $lang->search->objectTypeList['sprint']           = $lang->executionCommon;
+$lang->search->objectTypeList['kanban']           = '看板';
 $lang->search->objectTypeList['commonIssue']      = '问题';
 $lang->search->objectTypeList['stakeholderIssue'] = '干系人问题';
diff --git a/module/search/model.php b/module/search/model.php
index a233ae3974..40f2c1ab10 100644
--- a/module/search/model.php
+++ b/module/search/model.php
@@ -609,9 +609,16 @@ class searchModel extends model
                 $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, $issue->project);
                 $record->extraType = empty($issue->owner) ? 'commonIssue' : 'stakeholderIssue';
             }
+            elseif($module == 'project')
+            {
+                $projectModel = $this->dao->select('model')->from(TABLE_PROJECT)->where('id')->eq($record->objectID)->fetch('model');
+                $method       = $projectModel == 'kanban' ? 'index' : 'view';
+                $record->url  = helper::createLink('project', $method, "id={$record->objectID}");
+            }
             elseif($module == 'execution')
             {
                 $execution         = $this->dao->select('id,type,project')->from(TABLE_EXECUTION)->where('id')->eq($record->objectID)->fetch();
+                $method            = $execution->type == 'kanban' ? 'kanban' : $method;
                 $record->url       = helper::createLink('execution', $method, "id={$record->objectID}");
                 $record->extraType = empty($execution->type) ? '' : $execution->type;
             }
@@ -1015,7 +1022,7 @@ class searchModel extends model
                 ->where('1')
                 ->beginIF($type == 'program')->andWhere('type')->eq('program')->fi()
                 ->beginIF($type == 'project')->andWhere('type')->eq('project')->fi()
-                ->beginIF($type == 'execution')->andWhere('type')->in('stage,sprint')->fi()
+                ->beginIF($type == 'execution')->andWhere('type')->in('stage,sprint,kanban')->fi()
                 ->beginIF(isset($data->deleted))->andWhere('t1.deleted')->eq(0)->fi();
         }
         return $query;