From 0ea4f15d4b4eb476595cd5ecfafe2228f9981f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 28 Feb 2022 14:36:44 +0800
Subject: [PATCH 01/22] *

---
 module/execution/control.php              |    4 +-
 module/execution/js/kanban.js             |    2 +-
 module/execution/lang/zh-cn.php           |   75 +-
 module/execution/view/kanban.html.php     |   18 +-
 module/execution/view/taskkanban.html.php |    2 +-
 "module/search/\\"                        | 1205 +++++++++++++++++++++
 6 files changed, 1265 insertions(+), 41 deletions(-)
 create mode 100644 "module/search/\\"

diff --git a/module/execution/control.php b/module/execution/control.php
index a34d5c9f6a..47024b7fc6 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -520,7 +520,7 @@ class execution extends control
             {
                 $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
                 $kanbanData = json_encode($kanbanData);
-                    
+
                 return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
                 // return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
             }
@@ -2083,6 +2083,8 @@ class execution extends control
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
+        $this->view->allProducts         = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
+        a($this->view->allProducts);
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 25ec3382c3..64a60d76b1 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1049,7 +1049,7 @@ function createStoryMenu(options)
 
     var items      = [];
     var showAction = story.$col.type == 'backlog' || story.$col.type == 'ready' || story.$col.type == 'developing' || story.$col.type == 'developed' || story.$col.type == 'testing' || story.$col.type == 'tested' || story.$col.type == 'verified' || story.$col.type == 'released';
-    
+
     if(priv.canEditStory) items.push({label: storyLang.edit, icon: 'edit', url: createLink('story', 'edit', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
     if(priv.canChangeStory && showAction) items.push({label: storyLang.change, icon: 'change', url: createLink('story', 'change', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
     if(priv.canCreateTask && showAction) items.push({label: executionLang.wbs, icon: 'plus', url: createLink('task', 'create', 'executionID=' + execution.id + '&storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 61b7bf3e66..ad1aae59ee 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -292,44 +292,45 @@ $lang->execution->aboveAllProduct   = "以上所有{$lang->productCommon}";
 $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 页面提示。*/
-$lang->execution->linkStoryByPlanTips = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中";
-$lang->execution->selectExecution     = "请选择{$lang->execution->common}";
-$lang->execution->beginAndEnd         = '起止时间';
-$lang->execution->lblStats            = '工时统计';
-$lang->execution->stats               = '可用工时 <strong>%s</strong> 工时，总共预计 <strong>%s</strong> 工时，已经消耗 <strong>%s</strong> 工时，预计剩余 <strong>%s</strong> 工时';
-$lang->execution->taskSummary         = "本页共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计 <strong>%s</strong> 工时，已消耗 <strong>%s</strong> 工时，剩余 <strong>%s</strong> 工时。";
-$lang->execution->pageSummary         = "本页共 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
-$lang->execution->checkedSummary      = "选中 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
-$lang->execution->memberHoursAB       = "<div>%s有 <strong>%s</strong> 工时</div>";
-$lang->execution->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工时</div><div class="segment-value">%s</div></div></div></div>';
-$lang->execution->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总任务</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">进行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未开始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->execution->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总预计</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
-$lang->execution->groupSummaryAB      = "<div>总任务 <strong>%s : </strong><span class='text-muted'>未开始</span> %s &nbsp; <span class='text-muted'>进行中</span> %s</div><div>总预计 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩余</span> %s</div>";
-$lang->execution->wbs                 = "分解任务";
-$lang->execution->batchWBS            = "批量分解";
-$lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
-$lang->execution->whyNoStories        = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
-$lang->execution->productStories      = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
-$lang->execution->haveDraft           = "有%s条草稿状态的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
-$lang->execution->doneExecutions      = '已结束';
-$lang->execution->selectDept          = '选择部门';
-$lang->execution->selectDeptTitle     = '选择一个部门的成员';
-$lang->execution->copyTeam            = '复制团队';
-$lang->execution->copyFromTeam        = "复制自{$lang->execution->common}团队： <strong>%s</strong>";
-$lang->execution->noMatched           = "找不到包含'%s'的{$lang->execution->common}";
-$lang->execution->copyTitle           = "请选择一个{$lang->execution->common}来复制";
-$lang->execution->copyNoExecution     = "没有可用的{$lang->execution->common}来复制";
-$lang->execution->copyFromExecution   = "复制自{$lang->execution->common} <strong>%s</strong>";
-$lang->execution->cancelCopy          = '取消复制';
-$lang->execution->byPeriod            = '按时间段';
-$lang->execution->byUser              = '按用户';
-$lang->execution->noExecution         = "暂时没有{$lang->executionCommon}。";
-$lang->execution->noExecutions        = "暂时没有{$lang->execution->common}。";
-$lang->execution->noPrintData         = "暂无数据可打印";
-$lang->execution->noMembers           = '暂时没有团队成员。';
-$lang->execution->workloadTotal       = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
+$lang->execution->linkStoryByPlanTips  = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中";
+$lang->execution->batchCreateStroyTips = '请选择需要批量新建研发需求的产品';
+$lang->execution->selectExecution      = "请选择{$lang->execution->common}";
+$lang->execution->beginAndEnd          = '起止时间';
+$lang->execution->lblStats             = '工时统计';
+$lang->execution->stats                = '可用工时 <strong>%s</strong> 工时，总共预计 <strong>%s</strong> 工时，已经消耗 <strong>%s</strong> 工时，预计剩余 <strong>%s</strong> 工时';
+$lang->execution->taskSummary          = "本页共 <strong>%s</strong> 个任务，未开始 <strong>%s</strong>，进行中 <strong>%s</strong>，总预计 <strong>%s</strong> 工时，已消耗 <strong>%s</strong> 工时，剩余 <strong>%s</strong> 工时。";
+$lang->execution->pageSummary          = "本页共 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
+$lang->execution->checkedSummary       = "选中 <strong>%total%</strong> 个任务，未开始 <strong>%wait%</strong>，进行中 <strong>%doing%</strong>，总预计 <strong>%estimate%</strong> 工时，已消耗 <strong>%consumed%</strong> 工时，剩余 <strong>%left%</strong> 工时。";
+$lang->execution->memberHoursAB        = "<div>%s有 <strong>%s</strong> 工时</div>";
+$lang->execution->memberHours          = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s可用工时</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->countSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总任务</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">进行中</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">未开始</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
+$lang->execution->timeSummary          = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">总预计</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">已消耗</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">剩余</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->groupSummaryAB       = "<div>总任务 <strong>%s : </strong><span class='text-muted'>未开始</span> %s &nbsp; <span class='text-muted'>进行中</span> %s</div><div>总预计 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s &nbsp; <span class='text-muted'>剩余</span> %s</div>";
+$lang->execution->wbs                  = "分解任务";
+$lang->execution->batchWBS             = "批量分解";
+$lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图？' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
+$lang->execution->whyNoStories         = "看起来没有{$lang->SRCommon}可以关联。请检查下{$lang->executionCommon}关联的{$lang->productCommon}中有没有{$lang->SRCommon}，而且要确保它们已经审核通过。";
+$lang->execution->productStories       = "{$lang->executionCommon}关联的{$lang->SRCommon}是{$lang->productCommon}{$lang->SRCommon}的子集，并且只有评审通过的{$lang->SRCommon}才能关联。请<a href='%s'>关联{$lang->SRCommon}</a>。";
+$lang->execution->haveDraft            = "有%s条草稿状态的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
+$lang->execution->doneExecutions       = '已结束';
+$lang->execution->selectDept           = '选择部门';
+$lang->execution->selectDeptTitle      = '选择一个部门的成员';
+$lang->execution->copyTeam             = '复制团队';
+$lang->execution->copyFromTeam         = "复制自{$lang->execution->common}团队： <strong>%s</strong>";
+$lang->execution->noMatched            = "找不到包含'%s'的{$lang->execution->common}";
+$lang->execution->copyTitle            = "请选择一个{$lang->execution->common}来复制";
+$lang->execution->copyNoExecution      = "没有可用的{$lang->execution->common}来复制";
+$lang->execution->copyFromExecution    = "复制自{$lang->execution->common} <strong>%s</strong>";
+$lang->execution->cancelCopy           = '取消复制';
+$lang->execution->byPeriod             = '按时间段';
+$lang->execution->byUser               = '按用户';
+$lang->execution->noExecution          = "暂时没有{$lang->executionCommon}。";
+$lang->execution->noExecutions         = "暂时没有{$lang->execution->common}。";
+$lang->execution->noPrintData          = "暂无数据可打印";
+$lang->execution->noMembers            = '暂时没有团队成员。';
+$lang->execution->workloadTotal        = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
 // $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
-$lang->execution->linkAllStoryTip     = "(项目下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
+$lang->execution->linkAllStoryTip      = "(项目下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
 if($config->systemMode == 'classic') $lang->execution->copyTeamTitle = "选择一个{$lang->execution->common}团队来复制";
 if($config->systemMode == 'new')     $lang->execution->copyTeamTitle = "选择一个{$lang->project->common}或{$lang->execution->common}团队来复制";
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 99873cc289..1911587566 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -163,7 +163,7 @@ js::set('hasTaskButton', $hasTaskButton);
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
-        <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';?>
+        <?php if($canBatchCreateStory) echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
@@ -227,4 +227,20 @@ js::set('hasTaskButton', $hasTaskButton);
     </div>
   </div>
 </div>
+<div class="modal fade" id="batchCreateStroy">
+  <div class="modal-dialog mw-500px">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
+        <h4 class="modal-title"><?php echo $lang->execution->batchCreateStroyTips;?></h4>
+      </div>
+      <div class="modal-body">
+        <div class='input-group'>
+          <?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'"); a($productID);?>
+          <span class='input-group-btn'><?php echo html::commonButton($lang->execution->batchCreateStroy, "id='toStoryButton'", 'btn btn-primary');?></span>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index be4d9adccc..5f62eeb656 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -74,7 +74,7 @@
     $checkObject = new stdclass();
     $checkObject->execution = $executionID;
     $canCreateTask       = common::hasPriv('task', 'create', $checkObject);
-    $canBatchCreateTask  = common::hasPriv('task', 'batchCreate', $checkObject);    
+    $canBatchCreateTask  = common::hasPriv('task', 'batchCreate', $checkObject);
     $canCreateBug        = common::hasPriv('bug', 'create');
     $canBatchCreateBug   = common::hasPriv('bug', 'batchCreate');
     $canImportBug        = common::hasPriv('execution', 'importBug');
diff --git "a/module/search/\\" "b/module/search/\\"
new file mode 100644
index 0000000000..d7582f469c
--- /dev/null
+++ "b/module/search/\\"
@@ -0,0 +1,1205 @@
+<?php
+/**
+ * The model file of search module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     search
+ * @version     $Id: model.php 5082 2013-07-10 01:14:45Z wyd621@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php
+class searchModel extends model
+{
+
+    /**
+     * Set search params to session.
+     *
+     * @param  array    $searchConfig
+     * @access public
+     * @return void
+     */
+    public function setSearchParams($searchConfig)
+    {
+        $module = $searchConfig['module'];
+        if(isset($this->config->bizVersion))
+        {
+            $flowModule = $module;
+            if($module == 'projectStory') $flowModule = 'story';
+            if($module == 'projectBug')   $flowModule = 'bug';
+
+            $fields   = $this->loadModel('workflowfield')->getList($flowModule);
+            $maxCount = $this->config->maxCount;
+            $this->config->maxCount = 0;
+
+            foreach($fields as $field)
+            {
+                if($field->canSearch == 0) continue;
+
+                /* The built-in modules and user defined modules all have the subStatus field, so set its configuration first. */
+                if($field->field == 'subStatus')
+                {
+                    $field = $this->workflowfield->getByField($flowModule, 'subStatus');
+                    if(!isset($field->options[''])) $field->options[''] = '';
+
+                    $searchConfig['fields'][$field->field] = $field->name;
+                    $searchConfig['params'][$field->field] = array('operator' => '=', 'control' => 'select', 'values' => $field->options);
+
+                    continue;
+                }
+
+                /* The other built-in fields do not need to set their configuration. */
+                if($field->buildin) continue;
+
+                /* Set configuration for user defined fields. */
+                $operator = ($field->control == 'input' or $field->control == 'textarea') ? 'include' : '=';
+                $control  = ($field->control == 'select' or $field->control == 'multi-select' or $field->control == 'radio' or $field->control == 'checkbox') ? 'select' : 'input';
+                $options  = $this->workflowfield->getFieldOptions($field);
+                $class    = ($field->control == 'date' or $field->control == 'datetime') ? 'date' : ''; // Set date zui for date and datetime control.
+
+                $searchConfig['fields'][$field->field] = $field->name;
+                $searchConfig['params'][$field->field] = array('operator' => $operator, 'control' => $control,  'values' => $options, 'class' => $class);
+            }
+            $this->config->maxCount = $maxCount;
+        }
+
+        $searchParams['module']       = $searchConfig['module'];
+        $searchParams['searchFields'] = json_encode($searchConfig['fields']);
+        $searchParams['fieldParams']  = json_encode($searchConfig['params']);
+        $searchParams['actionURL']    = $searchConfig['actionURL'];
+        $searchParams['style']        = zget($searchConfig, 'style', 'full');
+        $searchParams['onMenuBar']    = zget($searchConfig, 'onMenuBar', 'no');
+        $searchParams['queryID']      = isset($searchConfig['queryID']) ? $searchConfig['queryID'] : 0;
+
+        $this->session->set($module . 'searchParams', $searchParams);
+    }
+
+    /**
+     * Build the query to execute.
+     *
+     * @access public
+     * @return void
+     */
+    public function buildQuery()
+    {
+        /* Init vars. */
+        $where        = '';
+        $groupItems   = $this->config->search->groupItems;
+        $groupAndOr   = strtoupper($this->post->groupAndOr);
+        $module       = $this->session->searchParams['module'];
+        $searchParams = $module . 'searchParams';
+        $fieldParams  = json_decode($_SESSION[$searchParams]['fieldParams']);
+        $scoreNum     = 0;
+
+        if($groupAndOr != 'AND' and $groupAndOr != 'OR') $groupAndOr = 'AND';
+
+        for($i = 1; $i <= $groupItems * 2; $i ++)
+        {
+            /* The and or between two groups. */
+            if($i == 1) $where .= '(( 1  ';
+            if($i == $groupItems + 1) $where .= " ) $groupAndOr ( 1 ";
+
+            /* Set var names. */
+            $fieldName    = "field$i";
+            $andOrName    = "andOr$i";
+            $operatorName = "operator$i";
+            $valueName    = "value$i";
+
+            /* Fix bug #2704. */
+            $field = $this->post->$fieldName;
+            if(isset($fieldParams->$field) and $fieldParams->$field->control == 'input' and $this->post->$valueName === '0') $this->post->$valueName = 'ZERO';
+            if($field == 'id' and $this->post->$valueName === '0') $this->post->$valueName = 'ZERO';
+
+            /* Skip empty values. */
+            if($this->post->$valueName == false) continue;
+            if($this->post->$valueName == 'ZERO') $this->post->$valueName = 0;   // ZERO is special, stands to 0.
+            if(isset($fieldParams->$field) and $fieldParams->$field->control == 'select' and $this->post->$valueName == 'null') $this->post->$valueName = '';   // Null is special, stands to empty if control is select. Fix bug #3279.
+
+            $scoreNum += 1;
+
+            /* Set and or. */
+            $andOr = strtoupper($this->post->$andOrName);
+            if($andOr != 'AND' and $andOr != 'OR') $andOr = 'AND';
+
+            /* Set operator. */
+            $value    = addcslashes(trim($this->post->$valueName), '%');
+            $operator = $this->post->$operatorName;
+            if(!isset($this->lang->search->operators[$operator])) $operator = '=';
+
+            /* Set condition. */
+            $condition = '';
+            if($operator == "include")
+            {
+                if($this->post->$fieldName == 'module')
+                {
+                    $allModules = $this->loadModel('tree')->getAllChildId($value);
+                    if($allModules) $condition = helper::dbIN($allModules);
+                }
+                else
+                {
+                    $condition = ' LIKE ' . $this->dbh->quote("%$value%");
+                }
+            }
+            elseif($operator == "notinclude")
+            {
+                if($this->post->$fieldName == 'module')
+                {
+                    $allModules = $this->loadModel('tree')->getAllChildId($value);
+                    if($allModules) $condition = " NOT " . helper::dbIN($allModules);
+                }
+                else
+                {
+                    $condition = ' NOT LIKE ' . $this->dbh->quote("%$value%");
+                }
+            }
+            elseif($operator == 'belong')
+            {
+                if($this->post->$fieldName == 'module')
+                {
+                    $allModules = $this->loadModel('tree')->getAllChildId($value);
+                    if($allModules) $condition = helper::dbIN($allModules);
+                }
+                elseif($this->post->$fieldName == 'dept')
+                {
+                    $allDepts = $this->loadModel('dept')->getAllChildId($value);
+                    $condition = helper::dbIN($allDepts);
+                }
+                else
+                {
+                    $condition = ' = ' . $this->dbh->quote($value) . ' ';
+                }
+            }
+            else
+            {
+                if($operator == 'between' and !isset($this->config->search->dynamic[$value])) $operator = '=';
+                $condition = $operator . ' ' . $this->dbh->quote($value) . ' ';
+
+                if($operator == '=' and $this->post->$fieldName == 'id' and preg_match('/^[0-9]+(,[0-9]+)+/', $value) and preg_match('/[\x00-\xff]+/', $value))
+                {
+                    $values = explode(',', trim($this->dbh->quote($value), "'"));
+                    foreach($values as $value)
+                    {
+                        $value = "'" . $value . "'";
+                    }
+
+                    $value     = implode(',', $values);
+                    $operator  = 'IN';
+                    $condition = $operator . ' (' . $value . ') ';
+                }
+            }
+
+            /* Processing query criteria. */
+            if($operator == '=' and preg_match('/^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}$/', $value))
+            {
+                $condition  = '`' . $this->post->$fieldName . "` >= '$value' AND `" . $this->post->$fieldName . "` <= '$value 23:59:59'";
+                $where     .= " $andOr ($condition)";
+            }
+            elseif($operator == '<=' and preg_match('/^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}$/', $value))
+            {
+                $where .= " $andOr " . '`' . $this->post->$fieldName . "` <= '$value 23:59:59'";
+            }
+            elseif($condition)
+            {
+                $where .= " $andOr " . '`' . $this->post->$fieldName . '` ' . $condition;
+            }
+        }
+
+        $where .=" ))";
+        $where  = $this->replaceDynamic($where);
+
+        /* Save to session. */
+        $querySessionName = $this->post->module . 'Query';
+        $formSessionName  = $this->post->module . 'Form';
+        $this->session->set($querySessionName, $where);
+        $this->session->set($formSessionName,  $_POST);
+        if($scoreNum > 2 && !dao::isError()) $this->loadModel('score')->create('search', 'saveQueryAdvanced');
+    }
+
+    /**
+     * Init the search session for the first time search.
+     *
+     * @param  string   $module
+     * @param  array    $fields
+     * @param  array    $fieldParams
+     * @access public
+     * @return void
+     */
+    public function initSession($module, $fields, $fieldParams)
+    {
+        $formSessionName  = $module . 'Form';
+        if(isset($_SESSION[$formSessionName]) and $_SESSION[$formSessionName] != false) return;
+
+        for($i = 1; $i <= $this->config->search->groupItems * 2; $i ++)
+        {
+            /* Var names. */
+            $fieldName    = "field$i";
+            $andOrName    = "andOr$i";
+            $operatorName = "operator$i";
+            $valueName    = "value$i";
+
+            $currentField = key($fields);
+            $operator     = isset($fieldParams[$currentField]['operator']) ? $fieldParams[$currentField]['operator'] : '=';
+
+            $queryForm[$fieldName]    = key($fields);
+            $queryForm[$andOrName]    = 'and';
+            $queryForm[$operatorName] = $operator;
+            $queryForm[$valueName]    =  '';
+
+            if(!next($fields)) reset($fields);
+        }
+        $queryForm['groupAndOr'] = 'and';
+        $this->session->set($formSessionName, $queryForm);
+    }
+
+    /**
+     * Set default params for selection.
+     *
+     * @param  array  $fields
+     * @param  array  $params
+     * @access public
+     * @return array
+     */
+    public function setDefaultParams($fields, $params)
+    {
+        $hasProduct   = false;
+        $hasExecution = false;
+        $hasUser      = false;
+
+        $appendUsers     = array();
+        $module          = $_SESSION['searchParams']['module'];
+        $formSessionName = $module . 'Form';
+        if(isset($_SESSION[$formSessionName]))
+        {
+            for($i = 1; $i <= $this->config->search->groupItems; $i ++)
+            {
+                $fieldName = 'field' . $i;
+                $valueName = 'value' . $i;
+                $fieldName = $_SESSION[$formSessionName][$fieldName];
+                if(isset($params[$fieldName]) and $params[$fieldName]['values'] == 'users')
+                {
+                    if($_SESSION[$formSessionName][$valueName]) $appendUsers[] = $_SESSION[$formSessionName][$valueName];
+                }
+            }
+        }
+
+        $fields = array_keys($fields);
+        foreach($fields as $fieldName)
+        {
+            if(empty($params[$fieldName])) continue;
+            if($params[$fieldName]['values'] == 'products')   $hasProduct   = true;
+            if($params[$fieldName]['values'] == 'users')      $hasUser      = true;
+            if($params[$fieldName]['values'] == 'executions') $hasExecution = true;
+        }
+
+        if($hasUser)
+        {
+            $users = $this->loadModel('user')->getPairs('realname|noclosed', $appendUsers, $this->config->maxCount);
+            $users['$@me'] = $this->lang->search->me;
+        }
+        if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->project);
+        if($hasExecution) $executions = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project);
+
+        foreach($fields as $fieldName)
+        {
+            if(!isset($params[$fieldName])) $params[$fieldName] = array('operator' => '=', 'control' => 'input', 'values' => '');
+            if($params[$fieldName]['values'] == 'users')
+            {
+                if(!empty($this->config->user->moreLink)) $this->config->moreLinks["field{$fieldName}"] = $this->config->user->moreLink;
+                $params[$fieldName]['values'] = $users;
+            }
+            if($params[$fieldName]['values'] == 'products')   $params[$fieldName]['values'] = $products;
+            if($params[$fieldName]['values'] == 'executions') $params[$fieldName]['values'] = $executions;
+            if(is_array($params[$fieldName]['values']))
+            {
+                /* For build right sql when key is 0 and is not null.  e.g. confirmed field. */
+                if(isset($params[$fieldName]['values'][0]) and $params[$fieldName]['values'][0] !== '')
+                {
+                    $params[$fieldName]['values'] = array('ZERO' => $params[$fieldName]['values'][0]) + $params[$fieldName]['values'];
+                    unset($params[$fieldName]['values'][0]);
+                }
+                elseif(empty($params[$fieldName]['values']))
+                {
+                    $params[$fieldName]['values'] = array('' => '', 'null' => $this->lang->search->null);
+                }
+                else
+                {
+                    $params[$fieldName]['values'] = $params[$fieldName]['values'] + array('null' => $this->lang->search->null);
+                }
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * Get a query.
+     *
+     * @param  int    $queryID
+     * @access public
+     * @return string
+     */
+    public function getQuery($queryID)
+    {
+        $query = $this->dao->findByID($queryID)->from(TABLE_USERQUERY)->fetch();
+        if(!$query) return false;
+
+        /* Decode html encode. */
+        $query->form = htmlspecialchars_decode($query->form, ENT_QUOTES);
+        $query->sql  = htmlspecialchars_decode($query->sql, ENT_QUOTES);
+
+        $hasDynamic  = strpos($query->form, '$') !== false;
+        $query->form = unserialize($query->form);
+        if($hasDynamic)
+        {
+            $_POST = $query->form;
+            $this->buildQuery();
+            $querySessionName = $query->form['module'] . 'Query';
+            $query->sql = $_SESSION[$querySessionName];
+        }
+        return $query;
+    }
+
+    /**
+     * Save current query to db.
+     *
+     * @access public
+     * @return void
+     */
+    public function saveQuery()
+    {
+        $sqlVar  = $this->post->module  . 'Query';
+        $formVar = $this->post->module  . 'Form';
+        $sql     = $_SESSION[$sqlVar];
+        if(!$sql) $sql = ' 1 = 1 ';
+
+        $query = fixer::input('post')
+            ->add('account', $this->app->user->account)
+            ->add('form', serialize($_SESSION[$formVar]))
+            ->add('sql',  $sql)
+            ->skipSpecial('sql,form')
+            ->remove('onMenuBar')
+            ->get();
+        if($this->post->onMenuBar) $query->shortcut = 1;
+        $this->dao->insert(TABLE_USERQUERY)->data($query)->autoCheck()->check('title', 'notempty')->exec();
+
+        if(!dao::isError())
+        {
+            $queryID = $this->dao->lastInsertID();
+            if(!dao::isError()) $this->loadModel('score')->create('search', 'saveQuery', $queryID);
+            return $queryID;
+        }
+        return false;
+    }
+
+    /**
+     * Delete current query from db.
+     *
+     * @param  int    $queryID
+     * @access public
+     * @return void
+     */
+    public function deleteQuery($queryID)
+    {
+        $this->dao->delete()->from(TABLE_USERQUERY)->where('id')->eq($queryID)->andWhere('account')->eq($this->app->user->account)->exec();
+        die('success');
+    }
+
+    /**
+     * Get title => id pairs of a user.
+     *
+     * @param  string    $module
+     * @access public
+     * @return array
+     */
+    public function getQueryPairs($module)
+    {
+        $queries = $this->dao->select('id, title')
+            ->from(TABLE_USERQUERY)
+            ->where('account')->eq($this->app->user->account)
+            ->andWhere('module')->eq($module)
+            ->orderBy('id_desc')
+            ->fetchPairs();
+        if(!$queries) return array('' => $this->lang->search->myQuery);
+        $queries = array('' => $this->lang->search->myQuery) + $queries;
+        return $queries;
+    }
+
+    /**
+     * Get records by the condition.
+     *
+     * @param  string    $module
+     * @param  string    $moduleIdList
+     * @param  string    $conditions
+     * @access public
+     * @return array
+     */
+    public function getBySelect($module, $moduleIdList, $conditions)
+    {
+        if($module == 'story')
+        {
+            $pairs = 'id,title';
+            $table = TABLE_STORY;
+        }
+        else if($module == 'task')
+        {
+            $pairs = 'id,name';
+            $table = TABLE_TASK;
+        }
+        $query    = '`' . $conditions['field1'] . '`';
+        $operator = $conditions['operator1'];
+        $value    = $conditions['value1'];
+
+        if(!isset($this->lang->search->operators[$operator])) $operator = '=';
+        if($operator == "include")
+        {
+            $query .= ' LIKE ' . $this->dbh->quote("%$value%");
+        }
+        elseif($operator == "notinclude")
+        {
+            $where .= ' NOT LIKE ' . $this->dbh->quote("%$value%");
+        }
+        else
+        {
+            $query .= $operator . ' ' . $this->dbh->quote($value) . ' ';
+        }
+
+        foreach($moduleIdList as $id)
+        {
+            if(!$id) continue;
+            $title = $this->dao->select($pairs)
+                ->from($table)
+                ->where('id')->eq((int)$id)
+                ->andWhere($query)
+                ->fetch();
+            if($title) $results[$id] = $title;
+        }
+        if(!isset($results)) return array();
+        return $this->formatResults($results, $module);
+    }
+
+    /**
+     * Format the results.
+     *
+     * @param  array    $results
+     * @param  string   $module
+     * @access public
+     * @return array
+     */
+    public function formatResults($results, $module)
+    {
+        /* Get title field. */
+        $title = ($module == 'story') ? 'title' : 'name';
+        $resultPairs = array('' => '');
+        foreach($results as $result) $resultPairs[$result->id] = $result->id . ':' . $result->$title;
+        return $resultPairs;
+    }
+
+    /**
+      Replace dynamic account and date.
+     *
+     * @param  string $query
+     * @access public
+     * @return string
+     */
+    public function replaceDynamic($query)
+    {
+        $this->app->loadClass('date');
+        $lastWeek  = date::getLastWeek();
+        $thisWeek  = date::getThisWeek();
+        $lastMonth = date::getLastMonth();
+        $thisMonth = date::getThisMonth();
+        $yesterday = date::yesterday();
+        $today     = date(DT_DATE1);
+        if(strpos($query, '$') !== false)
+        {
+            $query = str_replace('$@me', $this->app->user->account, $query);
+            $query = str_replace("'\$lastMonth'", "'" . $lastMonth['begin']      . "' and '" . $lastMonth['end']        . "'", $query);
+            $query = str_replace("'\$thisMonth'", "'" . $thisMonth['begin']      . "' and '" . $thisMonth['end']        . "'", $query);
+            $query = str_replace("'\$lastWeek'",  "'" . $lastWeek['begin']       . "' and '" . $lastWeek['end']         . "'", $query);
+            $query = str_replace("'\$thisWeek'",  "'" . $thisWeek['begin']       . "' and '" . $thisWeek['end']         . "'", $query);
+            $query = str_replace("'\$yesterday'", "'" . $yesterday . ' 00:00:00' . "' and '" . $yesterday . ' 23:59:59' . "'", $query);
+            $query = str_replace("'\$today'",     "'" . $today     . ' 00:00:00' . "' and '" . $today     . ' 23:59:59' . "'", $query);
+        }
+        return $query;
+    }
+
+    /**
+     * get search results of keywords.
+     *
+     * @param  string    $keywords
+     * @param  string    $type
+     * @access public
+     * @return array
+     */
+    public function getList($keywords, $type)
+    {
+        $spliter = $this->app->loadClass('spliter');
+        $words   = explode(' ', self::unify($keywords, ' '));
+
+        $against = '';
+        $againstCond   = '';
+        $likeCondition = '';
+        foreach($words as $word)
+        {
+            $splitedWords = $spliter->utf8Split($word);
+
+            $trimedWord     = trim($splitedWords['words']);
+            $against       .= '"' . $trimedWord . '" ';
+            $againstCond   .= '+"' . $trimedWord . '" ';
+            if(is_numeric($word) and strlen($word) == 5) $againstCond .= "-\" $word \" ";
+
+            $likeWord      = is_numeric($word) ? $word : $trimedWord;
+            if(is_numeric($word) and strlen($word) < 5) $likeWord = str_pad("|$likeWord|", 5, '_');
+            $condition = "OR title like '%{$likeWord}%' OR content like '%{$likeWord}%'";
+            if(is_numeric($word) and strlen($word) == 5) $condition = "OR title REGEXP '[^ ]{$likeWord}[^ ]' OR content REGEXP '[^ ]{$likeWord}[^ ]'";
+            $likeCondition .= $condition;
+        }
+
+        $words = str_replace('"', '', $against);
+        $words = str_pad($words, 5, '_');
+
+        $allowedObject = array();
+
+        if($type != 'all')
+        {
+            foreach($type as $module) $allowedObject[] = $module;
+        }
+        else
+        {
+            foreach($this->config->search->fields as $objectType => $fields)
+            {
+                $module = $objectType;
+                if($module == 'case') $module = 'testcase';
+                if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType;
+
+                if($module == 'caselib'    and common::hasPriv('caselib', 'view'))     $allowedObject[] = $objectType;
+                if($module == 'deploystep' and common::haspriv('deploy',  'viewstep')) $allowedobject[] = $objectType;
+            }
+        }
+
+        $scoreColumn = "((1 * (MATCH(title) AGAINST('{$against}' IN BOOLEAN MODE))) + (0.6 * (MATCH(content) AGAINST('{$against}' IN BOOLEAN MODE))) )";
+        $results = $this->dao->select("*, {$scoreColumn} as score")
+            ->from(TABLE_SEARCHINDEX)
+            ->where("(MATCH(title) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 or MATCH(content) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 $likeCondition)")
+            ->andWhere('vision')->eq($this->config->vision)
+            ->andWhere('objectType')->in($allowedObject)
+            ->andWhere('addedDate')->le(helper::now())
+            ->orderBy('score_desc, editedDate_desc')
+            ->fetchAll('id');
+
+        foreach($results as $record)
+        {
+            $record->title   = str_replace('</span> ', '</span>', $this->decode($this->markKeywords($record->title, $words)));
+            $record->title   = str_replace('_', '', $record->title);
+            $record->summary = str_replace('</span> ', '</span>', $this->getSummary($record->content, $words));
+            $record->summary = str_replace('_', '', $record->summary);
+
+            $module = $record->objectType == 'case' ? 'testcase' : $record->objectType;
+            $method = 'view';
+            if($module == 'deploystep')
+            {
+                $module = 'deploy';
+                $method = 'viewstep';
+            }
+
+            if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,trainplan,', ",$module,") !== false)
+            {
+                if(!isset($this->config->objectTables[$record->objectType])) continue;
+                $table       = $this->config->objectTables[$record->objectType];
+                $projectID   = $this->dao->select('project')->from($table)->where('id')->eq($record->objectID)->fetch('project');
+                $record->url = helper::createLink($module, $method, "id={$record->objectID}");
+            }
+            elseif($module == 'issue')
+            {
+                $issueField = isset($this->config->maxVersion)? 'id,project,owner,lib' : 'id,project,owner';
+                $issue      = $this->dao->select($issueField)->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch();
+                if(!empty($issue->lib))
+                {
+                    $module = 'assetlib';
+                    $method = 'issueView';
+                }
+
+                $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;
+            }
+            elseif($module == 'story')
+            {
+                $storyField = isset($this->config->maxVersion)? 'id,type,lib' : 'id,type';
+                $story      = $this->dao->select($storyField)->from(TABLE_STORY)->where('id')->eq($record->objectID)->fetch();
+                if(!empty($story->lib))
+                {
+                    $module = 'assetlib';
+                    $method = 'storyView';
+                }
+
+                $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
+
+                if($this->config->vision == 'lite') $record->url = helper::createLink('projectstory', $method, "storyID={$record->objectID}", '', false, 0, true);
+
+                $record->extraType = isset($story->type) ? $story->type : '';
+            }
+            elseif(($module == 'risk' or $module == 'opportunity') and isset($this->config->maxVersion))
+            {
+                $table  = $this->config->objectTables[$module];
+                $object = $this->dao->select('id,lib')->from($table)->where('id')->eq($record->objectID)->fetch();
+                if(!empty($object->lib))
+                {
+                    $method = $module == 'risk' ? 'riskView' : 'opportunityView';
+                    $module = 'assetlib';
+                }
+
+                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
+            }
+            elseif($module == 'doc' and isset($this->config->maxVersion))
+            {
+                $doc = $this->dao->select('id,assetLib,assetLibType')->from(TABLE_DOC)->where('id')->eq($record->objectID)->fetch();
+                if(!empty($doc->assetLib))
+                {
+                    $module = 'assetlib';
+                    $method = $doc->assetLibType == 'practice' ? 'practiceView' : 'componentView';
+                }
+
+                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
+            }
+            else
+            {
+                $record->url = helper::createLink($module, $method, "id={$record->objectID}");
+            }
+        }
+
+        return $this->checkPriv($results);
+    }
+
+    /**
+     * Save an index item.
+     *
+     * @param  string    $objectType article|blog|page|product|thread|reply|
+     * @param  int       $objectID
+     * @access public
+     * @return void
+     */
+    public function saveIndex($objectType, $object)
+    {
+        $fields = $this->config->search->fields->{$objectType};
+        if(empty($fields)) return true;
+
+        if($objectType == 'doc' && isset($this->config->bizVersion)) $object = $this->appendFiles($object);
+
+        $index = new stdclass();
+        $index->objectID   = $object->{$fields->id};
+        $index->objectType = $objectType;
+        $index->title      = $object->{$fields->title};
+        $index->addedDate  = isset($object->{$fields->addedDate}) ? $object->{$fields->addedDate} : '0000-00-00 00:00:00';
+        $index->editedDate = isset($object->{$fields->editedDate}) ? $object->{$fields->editedDate} : '0000-00-00 00:00:00';
+        $index->vision     = $this->config->vision;
+
+        $index->content = '';
+        $contentFields  = explode(',', $fields->content . ',comment');
+        foreach($contentFields as $field)
+        {
+            if(empty($field)) continue;
+            $index->content .= $object->$field;
+        }
+
+        $spliter = $this->app->loadClass('spliter');
+
+        $titleSplited   = $spliter->utf8Split($index->title);
+        $index->title   = $titleSplited['words'];
+        $contentSplited = $spliter->utf8Split(strip_tags($index->content));
+        $index->content = $contentSplited['words'];
+
+        $this->saveDict($titleSplited['dict'] + $contentSplited['dict']);
+        $this->dao->replace(TABLE_SEARCHINDEX)->data($index)->exec();
+        return true;
+    }
+
+    /**
+     * Save dict info.
+     *
+     * @param  array    $words
+     * @access public
+     * @return void
+     */
+    public function saveDict($dict)
+    {
+        static $savedDict;
+        if(empty($savedDict)) $savedDict = $this->dao->select("`key`")->from(TABLE_SEARCHDICT)->fetchPairs('key', 'key');
+        foreach($dict as $key => $value)
+        {
+            if(!is_numeric($key) or empty($value) or strlen($key) != 5 or $key < 0 or $key > 65535) continue;
+            if(isset($savedDict[$key])) continue;
+
+            $this->dao->insert(TABLE_SEARCHDICT)->data(array('key' => $key, 'value' => $value))->exec();
+            $savedDict[$key] = $key;
+        }
+    }
+
+    /**
+     * Transfer unicode to words.
+     *
+     * @param  string    $string
+     * @access public
+     * @return void
+     */
+    public function decode($string)
+    {
+        static $dict;
+        if(empty($dict))
+        {
+            $dict = $this->dao->select("concat(`key`, ' ') as `key`, value")->from(TABLE_SEARCHDICT)->fetchPairs();
+            $dict['|'] = '';
+        }
+        if(strpos($string, ' ') === false) return zget($dict, $string . ' ');
+        return trim(str_replace(array_keys($dict), array_values($dict), $string . ' '));
+    }
+
+    /**
+     * Get summary of results.
+     *
+     * @param  string    $content
+     * @param  string    $words
+     * @access public
+     * @return string
+     */
+    public function getSummary($content, $words)
+    {
+        $length = $this->config->search->summaryLength;
+        if(strlen($content) <= $length) return $this->decode($this->markKeywords($content, $words));
+
+        $content = $this->markKeywords($content, $words);
+        preg_match_all("/\<span class='text-danger'\>.*\<\/span\>/U", $content, $matches);
+
+        if(empty($matches[0])) return $this->decode($this->markKeywords(substr($content, 0, $length), $words));
+
+        $matches = $matches[0];
+        $score   = 0;
+        $needle  = '';
+        foreach($matches as $matched)
+        {
+            if(strlen($matched) > $score)
+            {
+                $content = str_replace($needle, strip_tags($needle), $content);
+                $needle  = $matched;
+                $score   = strlen($matched);
+            }
+        }
+
+        $content = str_replace('<span class', ' <spanclass', $content);
+        $content = explode(' ', $content);
+
+        $pos     = array_search(str_replace('<span class', '<spanclass', $needle), $content);
+
+        $start   = max(0, $pos - ($length / 2));
+        $summary = join(' ', array_slice($content, $start, $length));
+        $summary = str_replace(' <spanclass', '<span class', $summary);
+
+        return $this->decode($summary);
+    }
+
+    /**
+     * Check product and project priv.
+     *
+     * @param  array    $results
+     * @access public
+     * @return array
+     */
+    public function checkPriv($results)
+    {
+        if($this->app->user->admin) return $results;
+
+        $this->loadModel('doc');
+        $products   = $this->app->user->view->products;
+        $programs   = $this->app->user->view->programs;
+        $projects   = $this->app->user->view->projects;
+        $executions = $this->app->user->view->sprints;
+
+        $objectPairs = array();
+        $total       = count($results);
+        foreach($results as $record) $objectPairs[$record->objectType][$record->objectID] = $record->id;
+
+        foreach($objectPairs as $objectType => $objectIdList)
+        {
+            $objectProducts = array();
+            $objectExecutions = array();
+            if(!isset($this->config->objectTables[$objectType])) continue;
+            $table = $this->config->objectTables[$objectType];
+            if(strpos(',bug,case,productplan,release,story,testtask,', ",$objectType,") !== false)
+            {
+               $objectProducts = $this->dao->select('id,product')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('product', 'id');
+            }
+            elseif(strpos(',build,task,testreport,', ",$objectType,") !== false)
+            {
+               $objectExecutions = $this->dao->select('id,execution')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('execution', 'id');
+            }
+            elseif($objectType == 'effort')
+            {
+                $efforts = $this->dao->select('id,product,execution')->from($table)->where('id')->in(array_keys($objectIdList))->fetchAll();
+                foreach($efforts as $effort)
+                {
+                    $objectExecutions[$effort->execution][$effort->id] = $effort;
+                    $effortProducts = explode(',', trim($effort->product, ','));
+                    foreach($effortProducts as $effortProduct) $objectProducts[$effortProduct][$effort->id] = $effort;
+                }
+            }
+            elseif($objectType == 'product')
+            {
+                foreach($objectIdList as $productID => $recordID)
+                {
+                    if(strpos(",$products,", ",$productID,") === false) unset($results[$recordID]);
+                }
+            }
+            elseif($objectType == 'program')
+            {
+                foreach($objectIdList as $programID => $recordID)
+                {
+                    if(strpos(",$programs,", ",$programID,") === false) unset($results[$recordID]);
+                }
+            }
+            elseif($objectType == 'project')
+            {
+                foreach($objectIdList as $projectID => $recordID)
+                {
+                    if(strpos(",$projects,", ",$projectID,") === false) unset($results[$recordID]);
+                }
+            }
+            elseif($objectType == 'execution')
+            {
+                foreach($objectIdList as $executionID => $recordID)
+                {
+                    if(strpos(",$executions,", ",$executionID,") === false) unset($results[$recordID]);
+                }
+            }
+            elseif($objectType == 'doc')
+            {
+                $objectDocs = $this->dao->select('*')->from($table)->where('id')->in(array_keys($objectIdList))
+                    ->andWhere('deleted')->eq(0)
+                    ->fetchAll('id');
+                $privLibs = array();
+                foreach($objectIdList as $docID => $recordID)
+                {
+                    if(!isset($objectDocs[$docID]) or !$this->doc->checkPrivDoc($objectDocs[$docID]))
+                    {
+                        unset($results[$recordID]);
+                        continue;
+                    }
+
+                    $objectDoc = $objectDocs[$docID];
+                    $privLibs[$objectDoc->lib] = $objectDoc->lib;
+                }
+
+                $libs = $this->doc->getLibs('all');
+                $objectDocLibs = $this->dao->select('id')->from(TABLE_DOCLIB)->where('id')->in($privLibs)
+                    ->andWhere('id')->in(array_keys($libs))
+                    ->andWhere('deleted')->eq(0)
+                    ->fetchPairs('id', 'id');
+                foreach($objectDocs as $docID => $doc)
+                {
+                    $libID = $doc->lib;
+                    if(!isset($objectDocLibs[$libID]))
+                    {
+                        $recordID = $objectIdList[$docID];
+                        unset($results[$recordID]);
+                    }
+                }
+            }
+            elseif($objectType == 'todo')
+            {
+                $objectTodos = $this->dao->select('id')->from($table)->where('id')->in(array_keys($objectIdList))->andWhere("private")->eq(1)->fetchPairs('id', 'id');
+                foreach($objectTodos as $todoID)
+                {
+                    if(isset($objectIdList[$todoID]))
+                    {
+                        $recordID = $objectIdList[$todoID];
+                        unset($results[$recordID]);
+                    }
+                }
+            }
+            elseif($objectType == 'testsuite')
+            {
+                $objectSuites = $this->dao->select('id')->from($table)->where('id')->in(array_keys($objectIdList))
+                    ->andWhere("type")->eq('private')
+                    ->andWhere('deleted')->eq(0)
+                    ->fetchPairs('id', 'id');
+                foreach($objectSuites as $suiteID)
+                {
+                    if(isset($objectIdList[$suiteID]))
+                    {
+                        $recordID = $objectIdList[$suiteID];
+                        unset($results[$recordID]);
+                    }
+                }
+            }
+
+            foreach($objectProducts as $productID => $idList)
+            {
+                if(empty($productID)) continue;
+                if(strpos(",$products,", ",$productID,") === false)
+                {
+                    foreach($idList as $object)
+                    {
+                        $recordID = $objectIdList[$object->id];
+                        unset($results[$recordID]);
+                    }
+                }
+            }
+            foreach($objectExecutions as $executionID => $idList)
+            {
+                if(empty($executionID)) continue;
+                if(strpos(",$executions,", ",$executionID,") === false)
+                {
+                    foreach($idList as $object)
+                    {
+                        $recordID = $objectIdList[$object->id];
+                        unset($results[$recordID]);
+                    }
+                }
+            }
+        }
+        return $results;
+    }
+
+    /**
+     * Mark keywords in content.
+     *
+     * @param  string    $content
+     * @param  string    $keywords
+     * @access public
+     * @return void
+     */
+    public function markKeywords($content, $keywords)
+    {
+        $words = explode(' ', trim($keywords, ' '));
+        $markedWords = array();
+        $leftMark  = '|0000';
+        $rightMark = '0000|';
+
+        foreach($words as $key => $word)
+        {
+            if(preg_match('/^\|[0-9]+\|$/', $word))
+            {
+                $words[$key] = trim($word, '|');
+            }
+            elseif(is_numeric($word))
+            {
+                $words[$key] = $word . ' ';
+            }
+            else
+            {
+                $words[$key] = strlen($word) == 5 ? str_replace('_', '', $word) : $word;
+            }
+            $markedWords[] = $leftMark . $this->decode($word) . $rightMark;
+        }
+
+        $content = str_replace($words, $markedWords, $content . ' ');
+        $content = str_replace(array($leftMark, $rightMark), array("<span class='text-danger'>", "</span > "), $content);
+        $content = str_replace("</span > <span class='text-danger'>", '', $content);
+        $content = str_replace("</span >", '</span>', $content);
+
+        return $content;
+    }
+
+    /**
+     * Build index query.
+     *
+     * @param  string   $type
+     * @param  bool     $testDelete
+     * @access public
+     * @return string
+     */
+    public function buildIndexQuery($type, $testDeleted = true)
+    {
+        $table = $this->config->objectTables[$type];
+        if($type == 'story')
+        {
+            $query = $this->dao->select('DISTINCT t1.*,t2.spec,t2.verify')->from($table)->alias('t1')->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')->where('t1.deleted')->eq(0)->andWhere('t1.version=t2.version');
+        }
+        elseif($type == 'doc')
+        {
+            $query = $this->dao->select('DISTINCT t1.*,t2.content,t2.digest')->from($table)->alias('t1')->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id=t2.doc')->where('t1.deleted')->eq(0)->andWhere('t1.version=t2.version');
+        }
+        else
+        {
+            $data = '';
+            if($testDeleted) $data = $this->dao->select('*')->from($table)->limit(1)->fetch();
+
+            $query = $this->dao->select('t1.*')->from($table)->alias('t1')
+                ->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,kanban')->fi()
+                ->beginIF(isset($data->deleted))->andWhere('t1.deleted')->eq(0)->fi();
+        }
+        return $query;
+    }
+
+    /**
+     * Build all search index.
+     *
+     * @param  string    $type
+     * @param  int       $lastID
+     * @access public
+     * @return bool
+     */
+    public function buildAllIndex($type = '', $lastID = 0)
+    {
+        $limit      = 100;
+        $nextObject = false;
+        if(empty($type))
+        {
+            $this->dao->delete()->from(TABLE_SEARCHINDEX)->exec();
+            $this->dao->delete()->from(TABLE_SEARCHDICT)->exec();
+            try
+            {
+                $this->dbh->exec('ALTER TABLE ' . TABLE_SEARCHINDEX . ' auto_increment=1');
+            }
+            catch(Exception $e){}
+            $type = key($this->config->search->fields);
+        }
+
+        foreach($this->config->search->fields as $module => $field)
+        {
+            if($module != $type and !$nextObject) continue;
+            if($module == $type) $nextObject = true;
+            if(!isset($this->config->objectTables[$module])) continue;
+
+            while(true)
+            {
+                $query    = $this->buildIndexQuery($module);
+                $dataList = $query->beginIF($lastID)->andWhere('t1.id')->gt($lastID)->fi()->orderBy('t1.id')->limit($limit)->fetchAll('id');
+                if(empty($dataList))
+                {
+                    $lastID = 0;
+                    break;
+                }
+
+                if($module == 'case') $caseStep = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in(array_keys($dataList))->fetchGroup('case', 'id');
+                $actions = $this->dao->select('*')->from(TABLE_ACTION)
+                    ->where('objectType')->eq($module)
+                    ->andWhere('objectID')->in(array_keys($dataList))
+                    ->orderBy('date asc')
+                    ->fetchGroup('objectID', 'id');
+
+                $files = $this->dao->select('id,objectID,title,extension')->from(TABLE_FILE)
+                    ->where('objectType')->eq($module)
+                    ->andWhere('objectID')->in(array_keys($dataList))
+                    ->orderBy('id asc')
+                    ->fetchGroup('objectID', 'id');
+
+                foreach($dataList as $id => $data)
+                {
+                    $data->comment = '';
+                    if(isset($actions[$id]))
+                    {
+                        foreach($actions[$id] as $action)
+                        {
+                            if($action->action == 'opened')$data->{$field->addedDate} = $action->date;
+                            $data->{$field->editedDate} = $action->date;
+                            if(!empty($action->comment)) $data->comment .= $action->comment . "\n";
+                        }
+                    }
+
+                    if(isset($files[$id]))
+                    {
+                        foreach($files[$id] as $file)
+                        {
+                            if(!empty($file->title)) $data->comment .= $file->title . '.' . $file->extension . "\n";
+                        }
+                    }
+
+                    if($module == 'case')
+                    {
+                        $data->desc   = '';
+                        $data->expect = '';
+                        if(isset($caseStep[$id]))
+                        {
+                            foreach($caseStep[$id] as $step)
+                            {
+                                if($step->version != $data->version) continue;
+                                $data->desc   .= $step->desc . "\n";
+                                $data->expect .= $step->expect . "\n";
+                            }
+                        }
+                    }
+                }
+
+                foreach($dataList as $data) $this->saveIndex($module, $data);
+                return array('type' => $module, 'count' => count($dataList), 'lastID' => max(array_keys($dataList)));
+            }
+        }
+        return array('finished' => true);
+    }
+
+    /**
+     * Delete index of an object.
+     *
+     * @param  string    $objectType
+     * @param  int       $objectID
+     * @access public
+     * @return void
+     */
+    public function deleteIndex($objectType, $objectID)
+    {
+        $this->dao->delete()->from(TABLE_SEARCHINDEX)->where('objectType')->eq($objectType)->andWhere('objectID')->eq($objectID)->exec();
+        return !dao::isError();
+    }
+
+    /**
+     * Unified processing of search keywords.
+     *
+     * @param  string    $string
+     * @param  string    $to
+     * @access public
+     * @return void
+     */
+    public static function unify($string, $to = ',')
+    {
+        $labels = array('_', '、', ' ', '-', '\n', '?', '@', '&', '%', '~', '`', '+', '*', '/', '\\', '。', '，');
+        $string = str_replace($labels, $to, $string);
+        return preg_replace("/[{$to}]+/", $to, trim($string, $to));
+    }
+
+    /**
+     * Append document content to the document.
+     *
+     * @param  string    $object
+     * @access public
+     * @return void
+     */
+    public function appendFiles($object)
+    {
+        $docFiles = $this->dao->select('files')->from(TABLE_DOCCONTENT)->where('doc')->eq($object->id)->orderBy('version')->limit(1)->fetch('files');
+        if(empty($docFiles)) return $object;
+
+        $allDocFiles = $this->loadModel('file')->getByObject('doc', $object->id);
+        if(!isset($object->comment)) $object->comment = '';
+        foreach($allDocFiles as $file)
+        {
+            if(strpos(",$docFiles,", ",{$file->id},") === false) continue;
+            if(strpos('docx|doc', $file->extension) !== false)
+            {
+                $convertedFile = $this->file->convertOffice($file, 'txt');
+                if($convertedFile) $object->comment .= file_get_contents($convertedFile);
+            }
+            if($file->extension == 'txt')
+            {
+                $object->comment .= file_get_contents($file->realPath);
+            }
+        }
+
+        return $object;
+    }
+}

From 271e52a98c3f185f573f7e2d8e07893b2021b299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Mon, 28 Feb 2022 15:46:06 +0800
Subject: [PATCH 02/22] *

---
 module/execution/control.php          |  1 -
 module/execution/view/kanban.html.php | 14 +++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 47024b7fc6..52c2334b11 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2084,7 +2084,6 @@ class execution extends control
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
         $this->view->allProducts         = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
-        a($this->view->allProducts);
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 1911587566..1d1f627b7a 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -163,7 +163,15 @@ js::set('hasTaskButton', $hasTaskButton);
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
-        <?php if($canBatchCreateStory) echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';?>
+        <?php
+            if($canBatchCreateStory)
+            {
+                if(count($allProducts)>1)
+                echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';
+                else
+                echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';
+            }
+        ?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
@@ -236,8 +244,8 @@ js::set('hasTaskButton', $hasTaskButton);
       </div>
       <div class="modal-body">
         <div class='input-group'>
-          <?php echo html::select('plan', $allPlans, '', "class='form-control chosen' id='plan'"); a($productID);?>
-          <span class='input-group-btn'><?php echo html::commonButton($lang->execution->batchCreateStroy, "id='toStoryButton'", 'btn btn-primary');?></span>
+          <?php echo html::select('plan', $allProducts, '', "class='form-control chosen' id='plan'");?>
+          <span class='input-group-btn'><?php echo html::commonButton(html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn-primary iframe' data-width='90%'"), "id='toStoryButton'", 'btn btn-primary');?></span>
         </div>
       </div>
     </div>

From 40405cf7ece13adedbabcbe7052e9bff5b60785a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 08:42:43 +0800
Subject: [PATCH 03/22] *

---
 module/execution/view/kanban.html.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 1d1f627b7a..58cdc3ab4b 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -104,6 +104,7 @@ js::set('priv',
 js::set('hasStoryButton', $hasStoryButton);
 js::set('hasBugButton', $hasBugButton);
 js::set('hasTaskButton', $hasTaskButton);
+js::set('branch',$branchID);
 ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
@@ -219,6 +220,7 @@ js::set('hasTaskButton', $hasTaskButton);
   </div>
 </div>
 <?php endif;?>
+<?php js::set('execution',$execution->id);?>
 <div class="modal fade" id="linkStoryByPlan">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">
@@ -244,11 +246,19 @@ js::set('hasTaskButton', $hasTaskButton);
       </div>
       <div class="modal-body">
         <div class='input-group'>
-          <?php echo html::select('plan', $allProducts, '', "class='form-control chosen' id='plan'");?>
-          <span class='input-group-btn'><?php echo html::commonButton(html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn-primary iframe' data-width='90%'"), "id='toStoryButton'", 'btn btn-primary');?></span>
+          <?php echo html::select('products', $allProducts, '', "class='form-control chosen' id='products'");?>
+          <span class='input-group-btn', id='chuangjian'><?php echo html::commonButton(html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn-primary iframe' data-width='90%'"), "id='toStoryButton'", 'btn btn-primary');?></span>
         </div>
       </div>
     </div>
   </div>
 </div>
+<script>
+  $('.products').change(function(){
+      var selectProductID = $('#products').val();
+      var attr            = 'ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution;
+      alert(attr);
+      $('#chuangjian').children().attr('href','123456');
+  });
+</script>
 <?php include '../../common/view/footer.html.php';?>

From 87db779922edeb5969ff3cc8fe6d9e39e75b17de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 10:27:19 +0800
Subject: [PATCH 04/22] *

---
 module/execution/view/kanban.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 58cdc3ab4b..8f7e640d52 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -257,7 +257,7 @@ js::set('branch',$branchID);
   $('.products').change(function(){
       var selectProductID = $('#products').val();
       var attr            = 'ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution;
-      alert(attr);
+      alert($('#chuangjian').children());
       $('#chuangjian').children().attr('href','123456');
   });
 </script>

From 8b79ae9c09ca9e95682c88d13b1e4ed438d9a049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 14:00:40 +0800
Subject: [PATCH 05/22] *Story #30528

---
 module/execution/view/kanban.html.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 8f7e640d52..5696583391 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -254,11 +254,10 @@ js::set('branch',$branchID);
   </div>
 </div>
 <script>
-  $('.products').change(function(){
+  $('#products').change(function(){
       var selectProductID = $('#products').val();
-      var attr            = 'ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution;
-      alert($('#chuangjian').children());
-      $('#chuangjian').children().attr('href','123456');
+      var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution + '&onlybody=yes';
+      $('#chuangjian').children().children().attr('href',attr);
   });
 </script>
 <?php include '../../common/view/footer.html.php';?>

From b116054287f3c8245c3bcb16ead2e8a04db23d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 14:07:45 +0800
Subject: [PATCH 06/22] *

---
 module/execution/control.php             | 15 ---------------
 module/execution/view/importbug.html.php | 15 +++------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 52c2334b11..d212039839 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -515,20 +515,6 @@ class execution extends control
             $mails = $this->execution->importBug($executionID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
-            /* If link from no head then reload. */
-            if(isonlybody())
-            {
-                $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                $kanbanData = json_encode($kanbanData);
-
-                return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
-                // return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-            }
-            else
-            {
-                return print(js::reload('parent.parent'));
-            }
-            if(isonlybody()) return print(js::reload('parent.parent'));
             return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
         }
 
@@ -2083,7 +2069,6 @@ class execution extends control
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
-        $this->view->allProducts         = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 3c8dba8c91..4eaf81a875 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -70,27 +70,18 @@ var browseType = '<?php echo $browseType;?>';
         <?php endforeach;?>
       </tbody>
     </table>
+    <?php if($bugs):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always">
         <?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn');?>
       </div>
       <div class='btn-toolbar'>
-        <?php if(isonlybody()):?>
-        <?php echo html::submitButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
-        <?php else:?>
-        <?php echo html::backButton('','','btn');?>
-        <?php endif;?>
+        <?php echo html::backButton('', '', 'btn');?>
       </div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
+    <?php endif;?>
   </form>
 </div>
-<script>
-$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();})
-function goback()
-{
-    parent.location.reload();
-}
-</script>
 <?php include '../../common/view/footer.html.php';?>

From af0621582096c9c2e8dcd9c83d0afe2f9ed23792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 14:20:06 +0800
Subject: [PATCH 07/22] *

---
 module/execution/js/kanban.js         | 6 ++++++
 module/execution/view/kanban.html.php | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 64a60d76b1..4f04327390 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1,3 +1,9 @@
+$('#products').change(function()
+{
+  var selectProductID = $('#products').val();
+  var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&ex
+  $('#batchCreateStory').children().children().attr('href',attr);
+});
 /**
  * When execution status change.
  *
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 5696583391..5eaa24dd42 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -253,11 +253,4 @@ js::set('branch',$branchID);
     </div>
   </div>
 </div>
-<script>
-  $('#products').change(function(){
-      var selectProductID = $('#products').val();
-      var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution + '&onlybody=yes';
-      $('#chuangjian').children().children().attr('href',attr);
-  });
-</script>
 <?php include '../../common/view/footer.html.php';?>

From 5b99190d3261354af953f607b2f42c2a29adff59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 14:53:57 +0800
Subject: [PATCH 08/22] *

---
 module/execution/control.php  |  2 ++
 module/execution/js/kanban.js | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index d212039839..076758ae0d 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2069,6 +2069,8 @@ class execution extends control
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
+        $this->view->allProducts      = $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
+        a(count($this->view->allProducts));
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 4f04327390..3b1b17f29a 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1,9 +1,12 @@
-$('#products').change(function()
+$(function()
 {
-  var selectProductID = $('#products').val();
-  var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&ex
-  $('#batchCreateStory').children().children().attr('href',attr);
-});
+  $('#products').change(function()
+  {
+    var selectProductID = $('#products').val();
+    var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution + '&onlybody=yes';
+    $('#batchCreateStory').children().children().attr('href',attr);
+  });
+})
 /**
  * When execution status change.
  *

From 23511a047257387ccecaf98968f8748edf17ee7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 1 Mar 2022 15:37:05 +0800
Subject: [PATCH 09/22] *Story #30528.

---
 module/execution/control.php          | 1 -
 module/execution/js/kanban.js         | 2 +-
 module/execution/view/kanban.html.php | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 076758ae0d..b27a3f18ca 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2070,7 +2070,6 @@ class execution extends control
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
         $this->view->allProducts      = $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
-        a(count($this->view->allProducts));
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 3b1b17f29a..21b104034a 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -3,7 +3,7 @@ $(function()
   $('#products').change(function()
   {
     var selectProductID = $('#products').val();
-    var attr            = '/index.php?m=story&f=batchCreate&ProductID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution + '&onlybody=yes';
+    var attr            = ('story', 'batchCreate', selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
     $('#batchCreateStory').children().children().attr('href',attr);
   });
 })
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 5eaa24dd42..81d71505f1 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -247,7 +247,7 @@ js::set('branch',$branchID);
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('products', $allProducts, '', "class='form-control chosen' id='products'");?>
-          <span class='input-group-btn', id='chuangjian'><?php echo html::commonButton(html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn-primary iframe' data-width='90%'"), "id='toStoryButton'", 'btn btn-primary');?></span>
+          <span class='input-group-btn'><?php echo html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn btn-primary iframe' data-width='90%'");?></span>
         </div>
       </div>
     </div>

From a282e6c0e6021d2ed21d6d132110db89c2d8ae6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 09:56:58 +0800
Subject: [PATCH 10/22] *Story #30528.

---
 module/execution/css/kanban.css           |  1 +
 module/execution/js/kanban.js             |  6 +++---
 module/execution/lang/en.php              |  2 +-
 module/execution/lang/zh-cn.php           |  4 ++--
 module/execution/lang/zh-tw.php           |  2 +-
 module/execution/view/kanban.html.php     | 11 ++++++-----
 module/execution/view/taskkanban.html.php |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index ca89881d63..5353525847 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -107,3 +107,4 @@
 #mainMenu .divider {margin: 10px}
 
 .kanbanRegion {margin:5px}
+.modal-header{padding:15px 0;}
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 21b104034a..8d4dafee41 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -3,8 +3,8 @@ $(function()
   $('#products').change(function()
   {
     var selectProductID = $('#products').val();
-    var attr            = ('story', 'batchCreate', selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
-    $('#batchCreateStory').children().children().attr('href',attr);
+    var attr            = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
+    $('#batchCreateStoryButton').attr('href',attr);
   });
 })
 /**
@@ -272,7 +272,7 @@ function createColumnCreateMenu(options)
     if(col.type == 'backlog')
     {
         if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&objectID=' + executionID + '&bugID=0&planID=0&todoID=0&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
-        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID + '&plan=0&type=story&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
+        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStory,url: productCount>1 ? '#batchCreateStory' : $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID + '&plan=0&type=story&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe',attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
         if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID + '&browseType=&param=0&recTotal=0&recPerPage=50,&pageID=1&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
         if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal', 'data-target': '#linkStoryByPlan','data-col' : col.id, 'data-lane' : laneID, 'class' : 'linkStoryByPlanButton'}});
     }
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index a7de4f68fc..72d0478e0e 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -107,7 +107,7 @@ $lang->execution->unfoldClosed        = 'Unfold Closed';
 $lang->execution->editName            = 'Edit Name';
 $lang->execution->setWIP              = 'WIP Settings';
 $lang->execution->sortColumn          = 'Kanban Card Sorting';
-$lang->execution->batchCreateStroy    = "Batch create {$lang->SRCommon}";
+$lang->execution->batchCreateStory    = "Batch create {$lang->SRCommon}";
 $lang->execution->batchCreateTask     = 'Batch create task';
 $lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
 
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index ad1aae59ee..c47309f24b 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -107,7 +107,7 @@ $lang->execution->unfoldClosed        = '展开已结束';
 $lang->execution->editName            = '编辑名称';
 $lang->execution->setWIP              = '在制品数量设置（WIP）';
 $lang->execution->sortColumn          = '看板列卡片排序';
-$lang->execution->batchCreateStroy    = "批量新建{$lang->SRCommon}";
+$lang->execution->batchCreateStory    = "批量新建{$lang->SRCommon}";
 $lang->execution->batchCreateTask     = '批量建任务';
 $lang->execution->kanbanNoLinkProduct = "看板没有关联{$lang->productCommon}";
 
@@ -293,7 +293,7 @@ $lang->execution->aboveAllExecution = "以上所有{$lang->executionCommon}";
 
 /* 页面提示。*/
 $lang->execution->linkStoryByPlanTips  = "此操作会将所选计划下面的{$lang->SRCommon}全部关联到此{$lang->executionCommon}中";
-$lang->execution->batchCreateStroyTips = '请选择需要批量新建研发需求的产品';
+$lang->execution->batchCreateStoryTips = '请选择需要批量新建研发需求的产品';
 $lang->execution->selectExecution      = "请选择{$lang->execution->common}";
 $lang->execution->beginAndEnd          = '起止时间';
 $lang->execution->lblStats             = '工时统计';
diff --git a/module/execution/lang/zh-tw.php b/module/execution/lang/zh-tw.php
index d13a43b35f..39047bd819 100644
--- a/module/execution/lang/zh-tw.php
+++ b/module/execution/lang/zh-tw.php
@@ -107,7 +107,7 @@ $lang->execution->unfoldClosed     = '展開已結束';
 $lang->execution->editName         = '編輯名稱';
 $lang->execution->setWIP           = '在製品數量設置（WIP）';
 $lang->execution->sortColumn       = '看板列卡片排序';
-$lang->execution->batchCreateStroy = "批量新建{$lang->SRCommon}";
+$lang->execution->batchCreateStory = "批量新建{$lang->SRCommon}";
 $lang->execution->batchCreateTask  = '批量建任務';
 
 /* Fields of zt_team. */
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 81d71505f1..acb67ec0d7 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -48,6 +48,7 @@ js::set('colorListLang', $lang->kanbancard->colorList);
 js::set('colorList', $this->config->kanban->cardColorList);
 js::set('projectID', $projectID);
 js::set('vision', $this->config->vision);
+js::set('productCount', count($allProducts));
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
 $canEditRegion       = commonModel::hasPriv('kanban', 'editRegion');
@@ -168,9 +169,9 @@ js::set('branch',$branchID);
             if($canBatchCreateStory)
             {
                 if(count($allProducts)>1)
-                echo '<li>' . html::a('#batchCreateStroy', $lang->execution->batchCreateStroy, '', 'data-toggle="modal"') . '</li>';
+                echo '<li>' . html::a('#batchCreateStory', $lang->execution->batchCreateStory, '', 'data-toggle="modal"') . '</li>';
                 else
-                echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';
+                echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';
             }
         ?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
@@ -237,17 +238,17 @@ js::set('branch',$branchID);
     </div>
   </div>
 </div>
-<div class="modal fade" id="batchCreateStroy">
+<div class="modal fade" id="batchCreateStory">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="icon icon-close"></i></button>
-        <h4 class="modal-title"><?php echo $lang->execution->batchCreateStroyTips;?></h4>
+        <h4 class="modal-title"><?php echo $lang->execution->batchCreateStoryTips;?></h4>
       </div>
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('products', $allProducts, '', "class='form-control chosen' id='products'");?>
-          <span class='input-group-btn'><?php echo html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='btn btn-primary iframe' data-width='90%'");?></span>
+          <span class='input-group-btn'><?php echo html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='btn btn-primary iframe' data-width='90%' id='batchCreateStoryButton'");?></span>
         </div>
       </div>
     </div>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 5f62eeb656..f81b4a35c2 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -91,7 +91,7 @@
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
-        <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';?>
+        <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>

From f4bed0d0c66140c0a7891d6fb97b311f5f1f5acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 10:28:01 +0800
Subject: [PATCH 11/22] *

---
 module/execution/css/kanban.css       | 2 +-
 module/execution/view/kanban.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index 5353525847..ba5dc8b370 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -107,4 +107,4 @@
 #mainMenu .divider {margin: 10px}
 
 .kanbanRegion {margin:5px}
-.modal-header{padding:15px 0;}
+.modal-header {padding:15px 0;}
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index acb67ec0d7..e452d9baef 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -105,7 +105,7 @@ js::set('priv',
 js::set('hasStoryButton', $hasStoryButton);
 js::set('hasBugButton', $hasBugButton);
 js::set('hasTaskButton', $hasTaskButton);
-js::set('branch',$branchID);
+js::set('branch', $branchID);
 ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>

From b5bf40983ab11600833f27ed497c46743ab2bc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 10:39:24 +0800
Subject: [PATCH 12/22] *

---
 "module/search/\\"       | 1205 --------------------------------------
 module/story/control.php |    1 +
 2 files changed, 1 insertion(+), 1205 deletions(-)
 delete mode 100644 "module/search/\\"

diff --git "a/module/search/\\" "b/module/search/\\"
deleted file mode 100644
index d7582f469c..0000000000
--- "a/module/search/\\"
+++ /dev/null
@@ -1,1205 +0,0 @@
-<?php
-/**
- * The model file of search module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
- * @package     search
- * @version     $Id: model.php 5082 2013-07-10 01:14:45Z wyd621@gmail.com $
- * @link        http://www.zentao.net
- */
-?>
-<?php
-class searchModel extends model
-{
-
-    /**
-     * Set search params to session.
-     *
-     * @param  array    $searchConfig
-     * @access public
-     * @return void
-     */
-    public function setSearchParams($searchConfig)
-    {
-        $module = $searchConfig['module'];
-        if(isset($this->config->bizVersion))
-        {
-            $flowModule = $module;
-            if($module == 'projectStory') $flowModule = 'story';
-            if($module == 'projectBug')   $flowModule = 'bug';
-
-            $fields   = $this->loadModel('workflowfield')->getList($flowModule);
-            $maxCount = $this->config->maxCount;
-            $this->config->maxCount = 0;
-
-            foreach($fields as $field)
-            {
-                if($field->canSearch == 0) continue;
-
-                /* The built-in modules and user defined modules all have the subStatus field, so set its configuration first. */
-                if($field->field == 'subStatus')
-                {
-                    $field = $this->workflowfield->getByField($flowModule, 'subStatus');
-                    if(!isset($field->options[''])) $field->options[''] = '';
-
-                    $searchConfig['fields'][$field->field] = $field->name;
-                    $searchConfig['params'][$field->field] = array('operator' => '=', 'control' => 'select', 'values' => $field->options);
-
-                    continue;
-                }
-
-                /* The other built-in fields do not need to set their configuration. */
-                if($field->buildin) continue;
-
-                /* Set configuration for user defined fields. */
-                $operator = ($field->control == 'input' or $field->control == 'textarea') ? 'include' : '=';
-                $control  = ($field->control == 'select' or $field->control == 'multi-select' or $field->control == 'radio' or $field->control == 'checkbox') ? 'select' : 'input';
-                $options  = $this->workflowfield->getFieldOptions($field);
-                $class    = ($field->control == 'date' or $field->control == 'datetime') ? 'date' : ''; // Set date zui for date and datetime control.
-
-                $searchConfig['fields'][$field->field] = $field->name;
-                $searchConfig['params'][$field->field] = array('operator' => $operator, 'control' => $control,  'values' => $options, 'class' => $class);
-            }
-            $this->config->maxCount = $maxCount;
-        }
-
-        $searchParams['module']       = $searchConfig['module'];
-        $searchParams['searchFields'] = json_encode($searchConfig['fields']);
-        $searchParams['fieldParams']  = json_encode($searchConfig['params']);
-        $searchParams['actionURL']    = $searchConfig['actionURL'];
-        $searchParams['style']        = zget($searchConfig, 'style', 'full');
-        $searchParams['onMenuBar']    = zget($searchConfig, 'onMenuBar', 'no');
-        $searchParams['queryID']      = isset($searchConfig['queryID']) ? $searchConfig['queryID'] : 0;
-
-        $this->session->set($module . 'searchParams', $searchParams);
-    }
-
-    /**
-     * Build the query to execute.
-     *
-     * @access public
-     * @return void
-     */
-    public function buildQuery()
-    {
-        /* Init vars. */
-        $where        = '';
-        $groupItems   = $this->config->search->groupItems;
-        $groupAndOr   = strtoupper($this->post->groupAndOr);
-        $module       = $this->session->searchParams['module'];
-        $searchParams = $module . 'searchParams';
-        $fieldParams  = json_decode($_SESSION[$searchParams]['fieldParams']);
-        $scoreNum     = 0;
-
-        if($groupAndOr != 'AND' and $groupAndOr != 'OR') $groupAndOr = 'AND';
-
-        for($i = 1; $i <= $groupItems * 2; $i ++)
-        {
-            /* The and or between two groups. */
-            if($i == 1) $where .= '(( 1  ';
-            if($i == $groupItems + 1) $where .= " ) $groupAndOr ( 1 ";
-
-            /* Set var names. */
-            $fieldName    = "field$i";
-            $andOrName    = "andOr$i";
-            $operatorName = "operator$i";
-            $valueName    = "value$i";
-
-            /* Fix bug #2704. */
-            $field = $this->post->$fieldName;
-            if(isset($fieldParams->$field) and $fieldParams->$field->control == 'input' and $this->post->$valueName === '0') $this->post->$valueName = 'ZERO';
-            if($field == 'id' and $this->post->$valueName === '0') $this->post->$valueName = 'ZERO';
-
-            /* Skip empty values. */
-            if($this->post->$valueName == false) continue;
-            if($this->post->$valueName == 'ZERO') $this->post->$valueName = 0;   // ZERO is special, stands to 0.
-            if(isset($fieldParams->$field) and $fieldParams->$field->control == 'select' and $this->post->$valueName == 'null') $this->post->$valueName = '';   // Null is special, stands to empty if control is select. Fix bug #3279.
-
-            $scoreNum += 1;
-
-            /* Set and or. */
-            $andOr = strtoupper($this->post->$andOrName);
-            if($andOr != 'AND' and $andOr != 'OR') $andOr = 'AND';
-
-            /* Set operator. */
-            $value    = addcslashes(trim($this->post->$valueName), '%');
-            $operator = $this->post->$operatorName;
-            if(!isset($this->lang->search->operators[$operator])) $operator = '=';
-
-            /* Set condition. */
-            $condition = '';
-            if($operator == "include")
-            {
-                if($this->post->$fieldName == 'module')
-                {
-                    $allModules = $this->loadModel('tree')->getAllChildId($value);
-                    if($allModules) $condition = helper::dbIN($allModules);
-                }
-                else
-                {
-                    $condition = ' LIKE ' . $this->dbh->quote("%$value%");
-                }
-            }
-            elseif($operator == "notinclude")
-            {
-                if($this->post->$fieldName == 'module')
-                {
-                    $allModules = $this->loadModel('tree')->getAllChildId($value);
-                    if($allModules) $condition = " NOT " . helper::dbIN($allModules);
-                }
-                else
-                {
-                    $condition = ' NOT LIKE ' . $this->dbh->quote("%$value%");
-                }
-            }
-            elseif($operator == 'belong')
-            {
-                if($this->post->$fieldName == 'module')
-                {
-                    $allModules = $this->loadModel('tree')->getAllChildId($value);
-                    if($allModules) $condition = helper::dbIN($allModules);
-                }
-                elseif($this->post->$fieldName == 'dept')
-                {
-                    $allDepts = $this->loadModel('dept')->getAllChildId($value);
-                    $condition = helper::dbIN($allDepts);
-                }
-                else
-                {
-                    $condition = ' = ' . $this->dbh->quote($value) . ' ';
-                }
-            }
-            else
-            {
-                if($operator == 'between' and !isset($this->config->search->dynamic[$value])) $operator = '=';
-                $condition = $operator . ' ' . $this->dbh->quote($value) . ' ';
-
-                if($operator == '=' and $this->post->$fieldName == 'id' and preg_match('/^[0-9]+(,[0-9]+)+/', $value) and preg_match('/[\x00-\xff]+/', $value))
-                {
-                    $values = explode(',', trim($this->dbh->quote($value), "'"));
-                    foreach($values as $value)
-                    {
-                        $value = "'" . $value . "'";
-                    }
-
-                    $value     = implode(',', $values);
-                    $operator  = 'IN';
-                    $condition = $operator . ' (' . $value . ') ';
-                }
-            }
-
-            /* Processing query criteria. */
-            if($operator == '=' and preg_match('/^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}$/', $value))
-            {
-                $condition  = '`' . $this->post->$fieldName . "` >= '$value' AND `" . $this->post->$fieldName . "` <= '$value 23:59:59'";
-                $where     .= " $andOr ($condition)";
-            }
-            elseif($operator == '<=' and preg_match('/^[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}$/', $value))
-            {
-                $where .= " $andOr " . '`' . $this->post->$fieldName . "` <= '$value 23:59:59'";
-            }
-            elseif($condition)
-            {
-                $where .= " $andOr " . '`' . $this->post->$fieldName . '` ' . $condition;
-            }
-        }
-
-        $where .=" ))";
-        $where  = $this->replaceDynamic($where);
-
-        /* Save to session. */
-        $querySessionName = $this->post->module . 'Query';
-        $formSessionName  = $this->post->module . 'Form';
-        $this->session->set($querySessionName, $where);
-        $this->session->set($formSessionName,  $_POST);
-        if($scoreNum > 2 && !dao::isError()) $this->loadModel('score')->create('search', 'saveQueryAdvanced');
-    }
-
-    /**
-     * Init the search session for the first time search.
-     *
-     * @param  string   $module
-     * @param  array    $fields
-     * @param  array    $fieldParams
-     * @access public
-     * @return void
-     */
-    public function initSession($module, $fields, $fieldParams)
-    {
-        $formSessionName  = $module . 'Form';
-        if(isset($_SESSION[$formSessionName]) and $_SESSION[$formSessionName] != false) return;
-
-        for($i = 1; $i <= $this->config->search->groupItems * 2; $i ++)
-        {
-            /* Var names. */
-            $fieldName    = "field$i";
-            $andOrName    = "andOr$i";
-            $operatorName = "operator$i";
-            $valueName    = "value$i";
-
-            $currentField = key($fields);
-            $operator     = isset($fieldParams[$currentField]['operator']) ? $fieldParams[$currentField]['operator'] : '=';
-
-            $queryForm[$fieldName]    = key($fields);
-            $queryForm[$andOrName]    = 'and';
-            $queryForm[$operatorName] = $operator;
-            $queryForm[$valueName]    =  '';
-
-            if(!next($fields)) reset($fields);
-        }
-        $queryForm['groupAndOr'] = 'and';
-        $this->session->set($formSessionName, $queryForm);
-    }
-
-    /**
-     * Set default params for selection.
-     *
-     * @param  array  $fields
-     * @param  array  $params
-     * @access public
-     * @return array
-     */
-    public function setDefaultParams($fields, $params)
-    {
-        $hasProduct   = false;
-        $hasExecution = false;
-        $hasUser      = false;
-
-        $appendUsers     = array();
-        $module          = $_SESSION['searchParams']['module'];
-        $formSessionName = $module . 'Form';
-        if(isset($_SESSION[$formSessionName]))
-        {
-            for($i = 1; $i <= $this->config->search->groupItems; $i ++)
-            {
-                $fieldName = 'field' . $i;
-                $valueName = 'value' . $i;
-                $fieldName = $_SESSION[$formSessionName][$fieldName];
-                if(isset($params[$fieldName]) and $params[$fieldName]['values'] == 'users')
-                {
-                    if($_SESSION[$formSessionName][$valueName]) $appendUsers[] = $_SESSION[$formSessionName][$valueName];
-                }
-            }
-        }
-
-        $fields = array_keys($fields);
-        foreach($fields as $fieldName)
-        {
-            if(empty($params[$fieldName])) continue;
-            if($params[$fieldName]['values'] == 'products')   $hasProduct   = true;
-            if($params[$fieldName]['values'] == 'users')      $hasUser      = true;
-            if($params[$fieldName]['values'] == 'executions') $hasExecution = true;
-        }
-
-        if($hasUser)
-        {
-            $users = $this->loadModel('user')->getPairs('realname|noclosed', $appendUsers, $this->config->maxCount);
-            $users['$@me'] = $this->lang->search->me;
-        }
-        if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs('', $this->session->project);
-        if($hasExecution) $executions = array('' => '') + $this->loadModel('execution')->getPairs($this->session->project);
-
-        foreach($fields as $fieldName)
-        {
-            if(!isset($params[$fieldName])) $params[$fieldName] = array('operator' => '=', 'control' => 'input', 'values' => '');
-            if($params[$fieldName]['values'] == 'users')
-            {
-                if(!empty($this->config->user->moreLink)) $this->config->moreLinks["field{$fieldName}"] = $this->config->user->moreLink;
-                $params[$fieldName]['values'] = $users;
-            }
-            if($params[$fieldName]['values'] == 'products')   $params[$fieldName]['values'] = $products;
-            if($params[$fieldName]['values'] == 'executions') $params[$fieldName]['values'] = $executions;
-            if(is_array($params[$fieldName]['values']))
-            {
-                /* For build right sql when key is 0 and is not null.  e.g. confirmed field. */
-                if(isset($params[$fieldName]['values'][0]) and $params[$fieldName]['values'][0] !== '')
-                {
-                    $params[$fieldName]['values'] = array('ZERO' => $params[$fieldName]['values'][0]) + $params[$fieldName]['values'];
-                    unset($params[$fieldName]['values'][0]);
-                }
-                elseif(empty($params[$fieldName]['values']))
-                {
-                    $params[$fieldName]['values'] = array('' => '', 'null' => $this->lang->search->null);
-                }
-                else
-                {
-                    $params[$fieldName]['values'] = $params[$fieldName]['values'] + array('null' => $this->lang->search->null);
-                }
-            }
-        }
-        return $params;
-    }
-
-    /**
-     * Get a query.
-     *
-     * @param  int    $queryID
-     * @access public
-     * @return string
-     */
-    public function getQuery($queryID)
-    {
-        $query = $this->dao->findByID($queryID)->from(TABLE_USERQUERY)->fetch();
-        if(!$query) return false;
-
-        /* Decode html encode. */
-        $query->form = htmlspecialchars_decode($query->form, ENT_QUOTES);
-        $query->sql  = htmlspecialchars_decode($query->sql, ENT_QUOTES);
-
-        $hasDynamic  = strpos($query->form, '$') !== false;
-        $query->form = unserialize($query->form);
-        if($hasDynamic)
-        {
-            $_POST = $query->form;
-            $this->buildQuery();
-            $querySessionName = $query->form['module'] . 'Query';
-            $query->sql = $_SESSION[$querySessionName];
-        }
-        return $query;
-    }
-
-    /**
-     * Save current query to db.
-     *
-     * @access public
-     * @return void
-     */
-    public function saveQuery()
-    {
-        $sqlVar  = $this->post->module  . 'Query';
-        $formVar = $this->post->module  . 'Form';
-        $sql     = $_SESSION[$sqlVar];
-        if(!$sql) $sql = ' 1 = 1 ';
-
-        $query = fixer::input('post')
-            ->add('account', $this->app->user->account)
-            ->add('form', serialize($_SESSION[$formVar]))
-            ->add('sql',  $sql)
-            ->skipSpecial('sql,form')
-            ->remove('onMenuBar')
-            ->get();
-        if($this->post->onMenuBar) $query->shortcut = 1;
-        $this->dao->insert(TABLE_USERQUERY)->data($query)->autoCheck()->check('title', 'notempty')->exec();
-
-        if(!dao::isError())
-        {
-            $queryID = $this->dao->lastInsertID();
-            if(!dao::isError()) $this->loadModel('score')->create('search', 'saveQuery', $queryID);
-            return $queryID;
-        }
-        return false;
-    }
-
-    /**
-     * Delete current query from db.
-     *
-     * @param  int    $queryID
-     * @access public
-     * @return void
-     */
-    public function deleteQuery($queryID)
-    {
-        $this->dao->delete()->from(TABLE_USERQUERY)->where('id')->eq($queryID)->andWhere('account')->eq($this->app->user->account)->exec();
-        die('success');
-    }
-
-    /**
-     * Get title => id pairs of a user.
-     *
-     * @param  string    $module
-     * @access public
-     * @return array
-     */
-    public function getQueryPairs($module)
-    {
-        $queries = $this->dao->select('id, title')
-            ->from(TABLE_USERQUERY)
-            ->where('account')->eq($this->app->user->account)
-            ->andWhere('module')->eq($module)
-            ->orderBy('id_desc')
-            ->fetchPairs();
-        if(!$queries) return array('' => $this->lang->search->myQuery);
-        $queries = array('' => $this->lang->search->myQuery) + $queries;
-        return $queries;
-    }
-
-    /**
-     * Get records by the condition.
-     *
-     * @param  string    $module
-     * @param  string    $moduleIdList
-     * @param  string    $conditions
-     * @access public
-     * @return array
-     */
-    public function getBySelect($module, $moduleIdList, $conditions)
-    {
-        if($module == 'story')
-        {
-            $pairs = 'id,title';
-            $table = TABLE_STORY;
-        }
-        else if($module == 'task')
-        {
-            $pairs = 'id,name';
-            $table = TABLE_TASK;
-        }
-        $query    = '`' . $conditions['field1'] . '`';
-        $operator = $conditions['operator1'];
-        $value    = $conditions['value1'];
-
-        if(!isset($this->lang->search->operators[$operator])) $operator = '=';
-        if($operator == "include")
-        {
-            $query .= ' LIKE ' . $this->dbh->quote("%$value%");
-        }
-        elseif($operator == "notinclude")
-        {
-            $where .= ' NOT LIKE ' . $this->dbh->quote("%$value%");
-        }
-        else
-        {
-            $query .= $operator . ' ' . $this->dbh->quote($value) . ' ';
-        }
-
-        foreach($moduleIdList as $id)
-        {
-            if(!$id) continue;
-            $title = $this->dao->select($pairs)
-                ->from($table)
-                ->where('id')->eq((int)$id)
-                ->andWhere($query)
-                ->fetch();
-            if($title) $results[$id] = $title;
-        }
-        if(!isset($results)) return array();
-        return $this->formatResults($results, $module);
-    }
-
-    /**
-     * Format the results.
-     *
-     * @param  array    $results
-     * @param  string   $module
-     * @access public
-     * @return array
-     */
-    public function formatResults($results, $module)
-    {
-        /* Get title field. */
-        $title = ($module == 'story') ? 'title' : 'name';
-        $resultPairs = array('' => '');
-        foreach($results as $result) $resultPairs[$result->id] = $result->id . ':' . $result->$title;
-        return $resultPairs;
-    }
-
-    /**
-      Replace dynamic account and date.
-     *
-     * @param  string $query
-     * @access public
-     * @return string
-     */
-    public function replaceDynamic($query)
-    {
-        $this->app->loadClass('date');
-        $lastWeek  = date::getLastWeek();
-        $thisWeek  = date::getThisWeek();
-        $lastMonth = date::getLastMonth();
-        $thisMonth = date::getThisMonth();
-        $yesterday = date::yesterday();
-        $today     = date(DT_DATE1);
-        if(strpos($query, '$') !== false)
-        {
-            $query = str_replace('$@me', $this->app->user->account, $query);
-            $query = str_replace("'\$lastMonth'", "'" . $lastMonth['begin']      . "' and '" . $lastMonth['end']        . "'", $query);
-            $query = str_replace("'\$thisMonth'", "'" . $thisMonth['begin']      . "' and '" . $thisMonth['end']        . "'", $query);
-            $query = str_replace("'\$lastWeek'",  "'" . $lastWeek['begin']       . "' and '" . $lastWeek['end']         . "'", $query);
-            $query = str_replace("'\$thisWeek'",  "'" . $thisWeek['begin']       . "' and '" . $thisWeek['end']         . "'", $query);
-            $query = str_replace("'\$yesterday'", "'" . $yesterday . ' 00:00:00' . "' and '" . $yesterday . ' 23:59:59' . "'", $query);
-            $query = str_replace("'\$today'",     "'" . $today     . ' 00:00:00' . "' and '" . $today     . ' 23:59:59' . "'", $query);
-        }
-        return $query;
-    }
-
-    /**
-     * get search results of keywords.
-     *
-     * @param  string    $keywords
-     * @param  string    $type
-     * @access public
-     * @return array
-     */
-    public function getList($keywords, $type)
-    {
-        $spliter = $this->app->loadClass('spliter');
-        $words   = explode(' ', self::unify($keywords, ' '));
-
-        $against = '';
-        $againstCond   = '';
-        $likeCondition = '';
-        foreach($words as $word)
-        {
-            $splitedWords = $spliter->utf8Split($word);
-
-            $trimedWord     = trim($splitedWords['words']);
-            $against       .= '"' . $trimedWord . '" ';
-            $againstCond   .= '+"' . $trimedWord . '" ';
-            if(is_numeric($word) and strlen($word) == 5) $againstCond .= "-\" $word \" ";
-
-            $likeWord      = is_numeric($word) ? $word : $trimedWord;
-            if(is_numeric($word) and strlen($word) < 5) $likeWord = str_pad("|$likeWord|", 5, '_');
-            $condition = "OR title like '%{$likeWord}%' OR content like '%{$likeWord}%'";
-            if(is_numeric($word) and strlen($word) == 5) $condition = "OR title REGEXP '[^ ]{$likeWord}[^ ]' OR content REGEXP '[^ ]{$likeWord}[^ ]'";
-            $likeCondition .= $condition;
-        }
-
-        $words = str_replace('"', '', $against);
-        $words = str_pad($words, 5, '_');
-
-        $allowedObject = array();
-
-        if($type != 'all')
-        {
-            foreach($type as $module) $allowedObject[] = $module;
-        }
-        else
-        {
-            foreach($this->config->search->fields as $objectType => $fields)
-            {
-                $module = $objectType;
-                if($module == 'case') $module = 'testcase';
-                if(common::hasPriv($module, 'view')) $allowedObject[] = $objectType;
-
-                if($module == 'caselib'    and common::hasPriv('caselib', 'view'))     $allowedObject[] = $objectType;
-                if($module == 'deploystep' and common::haspriv('deploy',  'viewstep')) $allowedobject[] = $objectType;
-            }
-        }
-
-        $scoreColumn = "((1 * (MATCH(title) AGAINST('{$against}' IN BOOLEAN MODE))) + (0.6 * (MATCH(content) AGAINST('{$against}' IN BOOLEAN MODE))) )";
-        $results = $this->dao->select("*, {$scoreColumn} as score")
-            ->from(TABLE_SEARCHINDEX)
-            ->where("(MATCH(title) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 or MATCH(content) AGAINST('{$againstCond}' IN BOOLEAN MODE) >= 1 $likeCondition)")
-            ->andWhere('vision')->eq($this->config->vision)
-            ->andWhere('objectType')->in($allowedObject)
-            ->andWhere('addedDate')->le(helper::now())
-            ->orderBy('score_desc, editedDate_desc')
-            ->fetchAll('id');
-
-        foreach($results as $record)
-        {
-            $record->title   = str_replace('</span> ', '</span>', $this->decode($this->markKeywords($record->title, $words)));
-            $record->title   = str_replace('_', '', $record->title);
-            $record->summary = str_replace('</span> ', '</span>', $this->getSummary($record->content, $words));
-            $record->summary = str_replace('_', '', $record->summary);
-
-            $module = $record->objectType == 'case' ? 'testcase' : $record->objectType;
-            $method = 'view';
-            if($module == 'deploystep')
-            {
-                $module = 'deploy';
-                $method = 'viewstep';
-            }
-
-            if(strpos(',task,bug,testcase,build,release,testtask,testsuite,testreport,trainplan,', ",$module,") !== false)
-            {
-                if(!isset($this->config->objectTables[$record->objectType])) continue;
-                $table       = $this->config->objectTables[$record->objectType];
-                $projectID   = $this->dao->select('project')->from($table)->where('id')->eq($record->objectID)->fetch('project');
-                $record->url = helper::createLink($module, $method, "id={$record->objectID}");
-            }
-            elseif($module == 'issue')
-            {
-                $issueField = isset($this->config->maxVersion)? 'id,project,owner,lib' : 'id,project,owner';
-                $issue      = $this->dao->select($issueField)->from(TABLE_ISSUE)->where('id')->eq($record->objectID)->fetch();
-                if(!empty($issue->lib))
-                {
-                    $module = 'assetlib';
-                    $method = 'issueView';
-                }
-
-                $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;
-            }
-            elseif($module == 'story')
-            {
-                $storyField = isset($this->config->maxVersion)? 'id,type,lib' : 'id,type';
-                $story      = $this->dao->select($storyField)->from(TABLE_STORY)->where('id')->eq($record->objectID)->fetch();
-                if(!empty($story->lib))
-                {
-                    $module = 'assetlib';
-                    $method = 'storyView';
-                }
-
-                $record->url       = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
-
-                if($this->config->vision == 'lite') $record->url = helper::createLink('projectstory', $method, "storyID={$record->objectID}", '', false, 0, true);
-
-                $record->extraType = isset($story->type) ? $story->type : '';
-            }
-            elseif(($module == 'risk' or $module == 'opportunity') and isset($this->config->maxVersion))
-            {
-                $table  = $this->config->objectTables[$module];
-                $object = $this->dao->select('id,lib')->from($table)->where('id')->eq($record->objectID)->fetch();
-                if(!empty($object->lib))
-                {
-                    $method = $module == 'risk' ? 'riskView' : 'opportunityView';
-                    $module = 'assetlib';
-                }
-
-                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
-            }
-            elseif($module == 'doc' and isset($this->config->maxVersion))
-            {
-                $doc = $this->dao->select('id,assetLib,assetLibType')->from(TABLE_DOC)->where('id')->eq($record->objectID)->fetch();
-                if(!empty($doc->assetLib))
-                {
-                    $module = 'assetlib';
-                    $method = $doc->assetLibType == 'practice' ? 'practiceView' : 'componentView';
-                }
-
-                $record->url = helper::createLink($module, $method, "id={$record->objectID}", '', false, 0, true);
-            }
-            else
-            {
-                $record->url = helper::createLink($module, $method, "id={$record->objectID}");
-            }
-        }
-
-        return $this->checkPriv($results);
-    }
-
-    /**
-     * Save an index item.
-     *
-     * @param  string    $objectType article|blog|page|product|thread|reply|
-     * @param  int       $objectID
-     * @access public
-     * @return void
-     */
-    public function saveIndex($objectType, $object)
-    {
-        $fields = $this->config->search->fields->{$objectType};
-        if(empty($fields)) return true;
-
-        if($objectType == 'doc' && isset($this->config->bizVersion)) $object = $this->appendFiles($object);
-
-        $index = new stdclass();
-        $index->objectID   = $object->{$fields->id};
-        $index->objectType = $objectType;
-        $index->title      = $object->{$fields->title};
-        $index->addedDate  = isset($object->{$fields->addedDate}) ? $object->{$fields->addedDate} : '0000-00-00 00:00:00';
-        $index->editedDate = isset($object->{$fields->editedDate}) ? $object->{$fields->editedDate} : '0000-00-00 00:00:00';
-        $index->vision     = $this->config->vision;
-
-        $index->content = '';
-        $contentFields  = explode(',', $fields->content . ',comment');
-        foreach($contentFields as $field)
-        {
-            if(empty($field)) continue;
-            $index->content .= $object->$field;
-        }
-
-        $spliter = $this->app->loadClass('spliter');
-
-        $titleSplited   = $spliter->utf8Split($index->title);
-        $index->title   = $titleSplited['words'];
-        $contentSplited = $spliter->utf8Split(strip_tags($index->content));
-        $index->content = $contentSplited['words'];
-
-        $this->saveDict($titleSplited['dict'] + $contentSplited['dict']);
-        $this->dao->replace(TABLE_SEARCHINDEX)->data($index)->exec();
-        return true;
-    }
-
-    /**
-     * Save dict info.
-     *
-     * @param  array    $words
-     * @access public
-     * @return void
-     */
-    public function saveDict($dict)
-    {
-        static $savedDict;
-        if(empty($savedDict)) $savedDict = $this->dao->select("`key`")->from(TABLE_SEARCHDICT)->fetchPairs('key', 'key');
-        foreach($dict as $key => $value)
-        {
-            if(!is_numeric($key) or empty($value) or strlen($key) != 5 or $key < 0 or $key > 65535) continue;
-            if(isset($savedDict[$key])) continue;
-
-            $this->dao->insert(TABLE_SEARCHDICT)->data(array('key' => $key, 'value' => $value))->exec();
-            $savedDict[$key] = $key;
-        }
-    }
-
-    /**
-     * Transfer unicode to words.
-     *
-     * @param  string    $string
-     * @access public
-     * @return void
-     */
-    public function decode($string)
-    {
-        static $dict;
-        if(empty($dict))
-        {
-            $dict = $this->dao->select("concat(`key`, ' ') as `key`, value")->from(TABLE_SEARCHDICT)->fetchPairs();
-            $dict['|'] = '';
-        }
-        if(strpos($string, ' ') === false) return zget($dict, $string . ' ');
-        return trim(str_replace(array_keys($dict), array_values($dict), $string . ' '));
-    }
-
-    /**
-     * Get summary of results.
-     *
-     * @param  string    $content
-     * @param  string    $words
-     * @access public
-     * @return string
-     */
-    public function getSummary($content, $words)
-    {
-        $length = $this->config->search->summaryLength;
-        if(strlen($content) <= $length) return $this->decode($this->markKeywords($content, $words));
-
-        $content = $this->markKeywords($content, $words);
-        preg_match_all("/\<span class='text-danger'\>.*\<\/span\>/U", $content, $matches);
-
-        if(empty($matches[0])) return $this->decode($this->markKeywords(substr($content, 0, $length), $words));
-
-        $matches = $matches[0];
-        $score   = 0;
-        $needle  = '';
-        foreach($matches as $matched)
-        {
-            if(strlen($matched) > $score)
-            {
-                $content = str_replace($needle, strip_tags($needle), $content);
-                $needle  = $matched;
-                $score   = strlen($matched);
-            }
-        }
-
-        $content = str_replace('<span class', ' <spanclass', $content);
-        $content = explode(' ', $content);
-
-        $pos     = array_search(str_replace('<span class', '<spanclass', $needle), $content);
-
-        $start   = max(0, $pos - ($length / 2));
-        $summary = join(' ', array_slice($content, $start, $length));
-        $summary = str_replace(' <spanclass', '<span class', $summary);
-
-        return $this->decode($summary);
-    }
-
-    /**
-     * Check product and project priv.
-     *
-     * @param  array    $results
-     * @access public
-     * @return array
-     */
-    public function checkPriv($results)
-    {
-        if($this->app->user->admin) return $results;
-
-        $this->loadModel('doc');
-        $products   = $this->app->user->view->products;
-        $programs   = $this->app->user->view->programs;
-        $projects   = $this->app->user->view->projects;
-        $executions = $this->app->user->view->sprints;
-
-        $objectPairs = array();
-        $total       = count($results);
-        foreach($results as $record) $objectPairs[$record->objectType][$record->objectID] = $record->id;
-
-        foreach($objectPairs as $objectType => $objectIdList)
-        {
-            $objectProducts = array();
-            $objectExecutions = array();
-            if(!isset($this->config->objectTables[$objectType])) continue;
-            $table = $this->config->objectTables[$objectType];
-            if(strpos(',bug,case,productplan,release,story,testtask,', ",$objectType,") !== false)
-            {
-               $objectProducts = $this->dao->select('id,product')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('product', 'id');
-            }
-            elseif(strpos(',build,task,testreport,', ",$objectType,") !== false)
-            {
-               $objectExecutions = $this->dao->select('id,execution')->from($table)->where('id')->in(array_keys($objectIdList))->fetchGroup('execution', 'id');
-            }
-            elseif($objectType == 'effort')
-            {
-                $efforts = $this->dao->select('id,product,execution')->from($table)->where('id')->in(array_keys($objectIdList))->fetchAll();
-                foreach($efforts as $effort)
-                {
-                    $objectExecutions[$effort->execution][$effort->id] = $effort;
-                    $effortProducts = explode(',', trim($effort->product, ','));
-                    foreach($effortProducts as $effortProduct) $objectProducts[$effortProduct][$effort->id] = $effort;
-                }
-            }
-            elseif($objectType == 'product')
-            {
-                foreach($objectIdList as $productID => $recordID)
-                {
-                    if(strpos(",$products,", ",$productID,") === false) unset($results[$recordID]);
-                }
-            }
-            elseif($objectType == 'program')
-            {
-                foreach($objectIdList as $programID => $recordID)
-                {
-                    if(strpos(",$programs,", ",$programID,") === false) unset($results[$recordID]);
-                }
-            }
-            elseif($objectType == 'project')
-            {
-                foreach($objectIdList as $projectID => $recordID)
-                {
-                    if(strpos(",$projects,", ",$projectID,") === false) unset($results[$recordID]);
-                }
-            }
-            elseif($objectType == 'execution')
-            {
-                foreach($objectIdList as $executionID => $recordID)
-                {
-                    if(strpos(",$executions,", ",$executionID,") === false) unset($results[$recordID]);
-                }
-            }
-            elseif($objectType == 'doc')
-            {
-                $objectDocs = $this->dao->select('*')->from($table)->where('id')->in(array_keys($objectIdList))
-                    ->andWhere('deleted')->eq(0)
-                    ->fetchAll('id');
-                $privLibs = array();
-                foreach($objectIdList as $docID => $recordID)
-                {
-                    if(!isset($objectDocs[$docID]) or !$this->doc->checkPrivDoc($objectDocs[$docID]))
-                    {
-                        unset($results[$recordID]);
-                        continue;
-                    }
-
-                    $objectDoc = $objectDocs[$docID];
-                    $privLibs[$objectDoc->lib] = $objectDoc->lib;
-                }
-
-                $libs = $this->doc->getLibs('all');
-                $objectDocLibs = $this->dao->select('id')->from(TABLE_DOCLIB)->where('id')->in($privLibs)
-                    ->andWhere('id')->in(array_keys($libs))
-                    ->andWhere('deleted')->eq(0)
-                    ->fetchPairs('id', 'id');
-                foreach($objectDocs as $docID => $doc)
-                {
-                    $libID = $doc->lib;
-                    if(!isset($objectDocLibs[$libID]))
-                    {
-                        $recordID = $objectIdList[$docID];
-                        unset($results[$recordID]);
-                    }
-                }
-            }
-            elseif($objectType == 'todo')
-            {
-                $objectTodos = $this->dao->select('id')->from($table)->where('id')->in(array_keys($objectIdList))->andWhere("private")->eq(1)->fetchPairs('id', 'id');
-                foreach($objectTodos as $todoID)
-                {
-                    if(isset($objectIdList[$todoID]))
-                    {
-                        $recordID = $objectIdList[$todoID];
-                        unset($results[$recordID]);
-                    }
-                }
-            }
-            elseif($objectType == 'testsuite')
-            {
-                $objectSuites = $this->dao->select('id')->from($table)->where('id')->in(array_keys($objectIdList))
-                    ->andWhere("type")->eq('private')
-                    ->andWhere('deleted')->eq(0)
-                    ->fetchPairs('id', 'id');
-                foreach($objectSuites as $suiteID)
-                {
-                    if(isset($objectIdList[$suiteID]))
-                    {
-                        $recordID = $objectIdList[$suiteID];
-                        unset($results[$recordID]);
-                    }
-                }
-            }
-
-            foreach($objectProducts as $productID => $idList)
-            {
-                if(empty($productID)) continue;
-                if(strpos(",$products,", ",$productID,") === false)
-                {
-                    foreach($idList as $object)
-                    {
-                        $recordID = $objectIdList[$object->id];
-                        unset($results[$recordID]);
-                    }
-                }
-            }
-            foreach($objectExecutions as $executionID => $idList)
-            {
-                if(empty($executionID)) continue;
-                if(strpos(",$executions,", ",$executionID,") === false)
-                {
-                    foreach($idList as $object)
-                    {
-                        $recordID = $objectIdList[$object->id];
-                        unset($results[$recordID]);
-                    }
-                }
-            }
-        }
-        return $results;
-    }
-
-    /**
-     * Mark keywords in content.
-     *
-     * @param  string    $content
-     * @param  string    $keywords
-     * @access public
-     * @return void
-     */
-    public function markKeywords($content, $keywords)
-    {
-        $words = explode(' ', trim($keywords, ' '));
-        $markedWords = array();
-        $leftMark  = '|0000';
-        $rightMark = '0000|';
-
-        foreach($words as $key => $word)
-        {
-            if(preg_match('/^\|[0-9]+\|$/', $word))
-            {
-                $words[$key] = trim($word, '|');
-            }
-            elseif(is_numeric($word))
-            {
-                $words[$key] = $word . ' ';
-            }
-            else
-            {
-                $words[$key] = strlen($word) == 5 ? str_replace('_', '', $word) : $word;
-            }
-            $markedWords[] = $leftMark . $this->decode($word) . $rightMark;
-        }
-
-        $content = str_replace($words, $markedWords, $content . ' ');
-        $content = str_replace(array($leftMark, $rightMark), array("<span class='text-danger'>", "</span > "), $content);
-        $content = str_replace("</span > <span class='text-danger'>", '', $content);
-        $content = str_replace("</span >", '</span>', $content);
-
-        return $content;
-    }
-
-    /**
-     * Build index query.
-     *
-     * @param  string   $type
-     * @param  bool     $testDelete
-     * @access public
-     * @return string
-     */
-    public function buildIndexQuery($type, $testDeleted = true)
-    {
-        $table = $this->config->objectTables[$type];
-        if($type == 'story')
-        {
-            $query = $this->dao->select('DISTINCT t1.*,t2.spec,t2.verify')->from($table)->alias('t1')->leftJoin(TABLE_STORYSPEC)->alias('t2')->on('t1.id=t2.story')->where('t1.deleted')->eq(0)->andWhere('t1.version=t2.version');
-        }
-        elseif($type == 'doc')
-        {
-            $query = $this->dao->select('DISTINCT t1.*,t2.content,t2.digest')->from($table)->alias('t1')->leftJoin(TABLE_DOCCONTENT)->alias('t2')->on('t1.id=t2.doc')->where('t1.deleted')->eq(0)->andWhere('t1.version=t2.version');
-        }
-        else
-        {
-            $data = '';
-            if($testDeleted) $data = $this->dao->select('*')->from($table)->limit(1)->fetch();
-
-            $query = $this->dao->select('t1.*')->from($table)->alias('t1')
-                ->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,kanban')->fi()
-                ->beginIF(isset($data->deleted))->andWhere('t1.deleted')->eq(0)->fi();
-        }
-        return $query;
-    }
-
-    /**
-     * Build all search index.
-     *
-     * @param  string    $type
-     * @param  int       $lastID
-     * @access public
-     * @return bool
-     */
-    public function buildAllIndex($type = '', $lastID = 0)
-    {
-        $limit      = 100;
-        $nextObject = false;
-        if(empty($type))
-        {
-            $this->dao->delete()->from(TABLE_SEARCHINDEX)->exec();
-            $this->dao->delete()->from(TABLE_SEARCHDICT)->exec();
-            try
-            {
-                $this->dbh->exec('ALTER TABLE ' . TABLE_SEARCHINDEX . ' auto_increment=1');
-            }
-            catch(Exception $e){}
-            $type = key($this->config->search->fields);
-        }
-
-        foreach($this->config->search->fields as $module => $field)
-        {
-            if($module != $type and !$nextObject) continue;
-            if($module == $type) $nextObject = true;
-            if(!isset($this->config->objectTables[$module])) continue;
-
-            while(true)
-            {
-                $query    = $this->buildIndexQuery($module);
-                $dataList = $query->beginIF($lastID)->andWhere('t1.id')->gt($lastID)->fi()->orderBy('t1.id')->limit($limit)->fetchAll('id');
-                if(empty($dataList))
-                {
-                    $lastID = 0;
-                    break;
-                }
-
-                if($module == 'case') $caseStep = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->in(array_keys($dataList))->fetchGroup('case', 'id');
-                $actions = $this->dao->select('*')->from(TABLE_ACTION)
-                    ->where('objectType')->eq($module)
-                    ->andWhere('objectID')->in(array_keys($dataList))
-                    ->orderBy('date asc')
-                    ->fetchGroup('objectID', 'id');
-
-                $files = $this->dao->select('id,objectID,title,extension')->from(TABLE_FILE)
-                    ->where('objectType')->eq($module)
-                    ->andWhere('objectID')->in(array_keys($dataList))
-                    ->orderBy('id asc')
-                    ->fetchGroup('objectID', 'id');
-
-                foreach($dataList as $id => $data)
-                {
-                    $data->comment = '';
-                    if(isset($actions[$id]))
-                    {
-                        foreach($actions[$id] as $action)
-                        {
-                            if($action->action == 'opened')$data->{$field->addedDate} = $action->date;
-                            $data->{$field->editedDate} = $action->date;
-                            if(!empty($action->comment)) $data->comment .= $action->comment . "\n";
-                        }
-                    }
-
-                    if(isset($files[$id]))
-                    {
-                        foreach($files[$id] as $file)
-                        {
-                            if(!empty($file->title)) $data->comment .= $file->title . '.' . $file->extension . "\n";
-                        }
-                    }
-
-                    if($module == 'case')
-                    {
-                        $data->desc   = '';
-                        $data->expect = '';
-                        if(isset($caseStep[$id]))
-                        {
-                            foreach($caseStep[$id] as $step)
-                            {
-                                if($step->version != $data->version) continue;
-                                $data->desc   .= $step->desc . "\n";
-                                $data->expect .= $step->expect . "\n";
-                            }
-                        }
-                    }
-                }
-
-                foreach($dataList as $data) $this->saveIndex($module, $data);
-                return array('type' => $module, 'count' => count($dataList), 'lastID' => max(array_keys($dataList)));
-            }
-        }
-        return array('finished' => true);
-    }
-
-    /**
-     * Delete index of an object.
-     *
-     * @param  string    $objectType
-     * @param  int       $objectID
-     * @access public
-     * @return void
-     */
-    public function deleteIndex($objectType, $objectID)
-    {
-        $this->dao->delete()->from(TABLE_SEARCHINDEX)->where('objectType')->eq($objectType)->andWhere('objectID')->eq($objectID)->exec();
-        return !dao::isError();
-    }
-
-    /**
-     * Unified processing of search keywords.
-     *
-     * @param  string    $string
-     * @param  string    $to
-     * @access public
-     * @return void
-     */
-    public static function unify($string, $to = ',')
-    {
-        $labels = array('_', '、', ' ', '-', '\n', '?', '@', '&', '%', '~', '`', '+', '*', '/', '\\', '。', '，');
-        $string = str_replace($labels, $to, $string);
-        return preg_replace("/[{$to}]+/", $to, trim($string, $to));
-    }
-
-    /**
-     * Append document content to the document.
-     *
-     * @param  string    $object
-     * @access public
-     * @return void
-     */
-    public function appendFiles($object)
-    {
-        $docFiles = $this->dao->select('files')->from(TABLE_DOCCONTENT)->where('doc')->eq($object->id)->orderBy('version')->limit(1)->fetch('files');
-        if(empty($docFiles)) return $object;
-
-        $allDocFiles = $this->loadModel('file')->getByObject('doc', $object->id);
-        if(!isset($object->comment)) $object->comment = '';
-        foreach($allDocFiles as $file)
-        {
-            if(strpos(",$docFiles,", ",{$file->id},") === false) continue;
-            if(strpos('docx|doc', $file->extension) !== false)
-            {
-                $convertedFile = $this->file->convertOffice($file, 'txt');
-                if($convertedFile) $object->comment .= file_get_contents($convertedFile);
-            }
-            if($file->extension == 'txt')
-            {
-                $object->comment .= file_get_contents($file->realPath);
-            }
-        }
-
-        return $object;
-    }
-}
diff --git a/module/story/control.php b/module/story/control.php
index ee195dc703..24dee30e23 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -431,6 +431,7 @@ class story extends control
                 foreach($mails as $story) $products[$story->storyID] = $productID;
                 $this->execution->linkStory($executionID, $stories, $products, $extra);
                 if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $stories, $products);
+                return print(js::reload('parent.parent'));
             }
 
             /* If storyID not equal zero, subdivide this story to child stories and close it. */

From 0402049b855d556d76559d72314b65d0f6272891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 10:58:08 +0800
Subject: [PATCH 13/22] *

---
 module/execution/control.php             | 14 ++++++++++++++
 module/execution/view/importbug.html.php | 15 ++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index b27a3f18ca..581aaeb6fc 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -515,6 +515,20 @@ class execution extends control
             $mails = $this->execution->importBug($executionID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
+             /* If link from no head then reload. */
+            if(isonlybody())
+            {
+                $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                $kanbanData = json_encode($kanbanData);
+
+                return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
+                // return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
+             }
+            else
+            {
+                return print(js::reload('parent.parent'));
+            }
+            if(isonlybody()) return print(js::reload('parent.parent'));
             return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
         }
 
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 4eaf81a875..3658b6f6a0 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -70,18 +70,27 @@ var browseType = '<?php echo $browseType;?>';
         <?php endforeach;?>
       </tbody>
     </table>
-    <?php if($bugs):?>
     <div class='table-footer'>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
       <div class="table-actions btn-toolbar show-always">
         <?php echo html::submitButton('<i class="icon icon-import icon-sm"></i> ' . $lang->import, '', 'btn');?>
       </div>
       <div class='btn-toolbar'>
-        <?php echo html::backButton('', '', 'btn');?>
+        <?php if(isonlybody()):?>
+        <?php echo html::submitButton('<i class="icon icon-back icon-sm"></i> ' . $lang->goback, 'onclick="goback()"', 'btn');?>
+        <?php else:?>
+        <?php echo html::backButton('','','btn');?>
+        <?php endif;?>
       </div>
       <?php $pager->show('right', 'pagerjs');?>
     </div>
-    <?php endif;?>
   </form>
 </div>
+<script>
+$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();})
+    function goback()
+    {
+            parent.location.reload();
+    }
+</script>
 <?php include '../../common/view/footer.html.php';?>

From 33a2aec741fbee24274265ad161c9d38baf81639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:00:51 +0800
Subject: [PATCH 14/22] *

---
 module/execution/control.php             | 4 ++--
 module/execution/view/importbug.html.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 581aaeb6fc..aecafc05ca 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -515,7 +515,7 @@ class execution extends control
             $mails = $this->execution->importBug($executionID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
-             /* If link from no head then reload. */
+            /* If link from no head then reload. */
             if(isonlybody())
             {
                 $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
@@ -523,7 +523,7 @@ class execution extends control
 
                 return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
                 // return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
-             }
+            }
             else
             {
                 return print(js::reload('parent.parent'));
diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 3658b6f6a0..3c8dba8c91 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -88,9 +88,9 @@ var browseType = '<?php echo $browseType;?>';
 </div>
 <script>
 $(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();})
-    function goback()
-    {
-            parent.location.reload();
-    }
+function goback()
+{
+    parent.location.reload();
+}
 </script>
 <?php include '../../common/view/footer.html.php';?>

From abd00b8f088230a20f49b5498495371f15370a56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:13:22 +0800
Subject: [PATCH 15/22] *

---
 module/execution/css/kanban.css       |  4 ++--
 module/execution/js/kanban.js         | 14 +++++++-------
 module/execution/view/kanban.html.php |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index ba5dc8b370..a987329020 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -106,5 +106,5 @@
 
 #mainMenu .divider {margin: 10px}
 
-.kanbanRegion {margin:5px}
-.modal-header {padding:15px 0;}
+.kanbanRegion {margin: 5px}
+.modal-header {padding: 15px 0;}
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 8d4dafee41..7a487b05d7 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1,11 +1,11 @@
 $(function()
 {
-  $('#products').change(function()
-  {
-    var selectProductID = $('#products').val();
-    var attr            = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
-    $('#batchCreateStoryButton').attr('href',attr);
-  });
+    $('#products').change(function()
+    {
+        var selectProductID = $('#products').val();
+        var attr            = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
+        $('#batchCreateStoryButton').attr('href',attr);
+    });
 })
 /**
  * When execution status change.
@@ -272,7 +272,7 @@ function createColumnCreateMenu(options)
     if(col.type == 'backlog')
     {
         if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&objectID=' + executionID + '&bugID=0&planID=0&todoID=0&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
-        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStory,url: productCount>1 ? '#batchCreateStory' : $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID + '&plan=0&type=story&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe',attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
+        if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStory, url: productCount > 1 ? '#batchCreateStory' : $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID + '&plan=0&type=story&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe',attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
         if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID + '&browseType=&param=0&recTotal=0&recPerPage=50,&pageID=1&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
         if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal', 'data-target': '#linkStoryByPlan','data-col' : col.id, 'data-lane' : laneID, 'class' : 'linkStoryByPlanButton'}});
     }
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index e452d9baef..a0c9e7da30 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -248,7 +248,7 @@ js::set('branch', $branchID);
       <div class="modal-body">
         <div class='input-group'>
           <?php echo html::select('products', $allProducts, '', "class='form-control chosen' id='products'");?>
-          <span class='input-group-btn'><?php echo html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='btn btn-primary iframe' data-width='90%' id='batchCreateStoryButton'");?></span>
+          <span class='input-group-btn'><?php echo html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='btn btn-primary iframe' data-width='90%' id='batchCreateStoryButton' data-dismiss='modal'");?></span>
         </div>
       </div>
     </div>

From 5d61f31c3bade7d7fe6d4f123b335bc3ef1fcd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:22:23 +0800
Subject: [PATCH 16/22] *

---
 module/execution/js/kanban.js         |  2 +-
 module/execution/lang/en.php          | 77 ++++++++++++++-------------
 module/execution/view/kanban.html.php |  3 +-
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 7a487b05d7..9a60c6d85b 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -3,7 +3,7 @@ $(function()
     $('#products').change(function()
     {
         var selectProductID = $('#products').val();
-        var attr            = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=' + branch + '&moduleID=0&story=0&execution=' + execution, '', true);
+        var attr            = createLink('story', 'batchCreate', 'productID=' + selectProductID + '&branch=0' + '&moduleID=0&story=0&execution=' + executionID, '', true);
         $('#batchCreateStoryButton').attr('href',attr);
     });
 })
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 72d0478e0e..0e5b371ead 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -292,44 +292,45 @@ $lang->execution->aboveAllProduct   = "All the above {$lang->productCommon}s";
 $lang->execution->aboveAllExecution = "All the above {$lang->executionCommon}s";
 
 /* Page prompt. */
-$lang->execution->linkStoryByPlanTips = "This action will link all stories in this plan to the {$lang->executionCommon}.";
-$lang->execution->selectExecution     = "Select {$lang->executionCommon}";
-$lang->execution->beginAndEnd         = 'Duration';
-$lang->execution->lblStats            = 'Efforts';
-$lang->execution->stats               = 'Available: <strong>%s</strong>(h). Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).';
-$lang->execution->taskSummary         = "Total tasks on this page:<strong>%s</strong>. Waiting: <strong>%s</strong>. Doing: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).";
-$lang->execution->pageSummary         = "Total tasks: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
-$lang->execution->checkedSummary      = "Selected: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
-$lang->execution->memberHoursAB       = "%s has <strong>%s</ strong> hours.";
-$lang->execution->memberHours         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Available Hours</div><div class="segment-value">%s</div></div></div></div>';
-$lang->execution->countSummary        = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Waiting</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
-$lang->execution->timeSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Estimates</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
-$lang->execution->groupSummaryAB      = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Waiting</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Estimates <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
-$lang->execution->wbs                 = "Create Task";
-$lang->execution->batchWBS            = "Batch Create Tasks";
-$lang->execution->howToUpdateBurn     = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
-$lang->execution->whyNoStories        = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
-$lang->execution->productStories      = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Stories</a> now.";
-$lang->execution->haveDraft           = "%s stories in draft, so they can't be linked.";
-$lang->execution->doneExecutions      = 'Finished';
-$lang->execution->selectDept          = 'Select Department';
-$lang->execution->selectDeptTitle     = 'Select User';
-$lang->execution->copyTeam            = 'Copy Team';
-$lang->execution->copyFromTeam        = "Copy from {$lang->execution->common} Team: <strong>%s</strong>";
-$lang->execution->noMatched           = "No {$lang->execution->common} including '%s'can be found.";
-$lang->execution->copyTitle           = "Choose a {$lang->execution->common} to copy.";
-$lang->execution->copyNoExecution     = "No {$lang->execution->common} can be copied.";
-$lang->execution->copyFromExecution   = "Copy from {$lang->execution->common} <strong>%s</strong>";
-$lang->execution->cancelCopy          = 'Cancel Copy';
-$lang->execution->byPeriod            = 'By Time';
-$lang->execution->byUser              = 'By User';
-$lang->execution->noExecution         = "No {$lang->executionCommon}. ";
-$lang->execution->noExecutions        = "No {$lang->execution->common}.";
-$lang->execution->noPrintData         = "No data can be printed.";
-$lang->execution->noMembers           = 'No team members yet. ';
-$lang->execution->workloadTotal       = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
-// $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
-$lang->execution->linkAllStoryTip     = "({$lang->SRCommon} has never been linked under the execution, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
+$lang->execution->linkStoryByPlanTips  = "This action will link all stories in this plan to the {$lang->executionCommon}.";
+$lang->execution->batchCreateStoryTips = "Please select the product that needs to be created in batches";
+$lang->execution->selectExecution      = "Select {$lang->executionCommon}";
+$lang->execution->beginAndEnd          = 'Duration';
+$lang->execution->lblStats             = 'Efforts';
+$lang->execution->stats                = 'Available: <strong>%s</strong>(h). Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).';
+$lang->execution->taskSummary          = "Total tasks on this page:<strong>%s</strong>. Waiting: <strong>%s</strong>. Doing: <strong>%s</strong>.  &nbsp;&nbsp;&nbsp;  Estimates: <strong>%s</strong>(h). Cost: <strong>%s</strong>(h). Left: <strong>%s</strong>(h).";
+$lang->execution->pageSummary          = "Total tasks: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
+$lang->execution->checkedSummary       = "Selected: <strong>%total%</strong>. Waiting: <strong>%wait%</strong>. Doing: <strong>%doing%</strong>.    Estimates: <strong>%estimate%</strong>(h). Cost: <strong>%consumed%</strong>(h). Left: <strong>%left%</strong>(h).";
+$lang->execution->memberHoursAB        = "%s has <strong>%s</ strong> hours.";
+$lang->execution->memberHours          = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">%s Available Hours</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->countSummary         = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Waiting</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
+$lang->execution->timeSummary          = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Estimates</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
+$lang->execution->groupSummaryAB       = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Waiting</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Estimates <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
+$lang->execution->wbs                  = "Create Task";
+$lang->execution->batchWBS             = "Batch Create Tasks";
+$lang->execution->howToUpdateBurn      = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
+$lang->execution->whyNoStories         = "No story can be linked. Please check whether there is any story in {$lang->executionCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
+$lang->execution->productStories       = "Stories linked to {$lang->executionCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Stories</a> now.";
+$lang->execution->haveDraft            = "%s stories in draft, so they can't be linked.";
+$lang->execution->doneExecutions       = 'Finished';
+$lang->execution->selectDept           = 'Select Department';
+$lang->execution->selectDeptTitle      = 'Select User';
+$lang->execution->copyTeam             = 'Copy Team';
+$lang->execution->copyFromTeam         = "Copy from {$lang->execution->common} Team: <strong>%s</strong>";
+$lang->execution->noMatched            = "No {$lang->execution->common} including '%s'can be found.";
+$lang->execution->copyTitle            = "Choose a {$lang->execution->common} to copy.";
+$lang->execution->copyNoExecution      = "No {$lang->execution->common} can be copied.";
+$lang->execution->copyFromExecution    = "Copy from {$lang->execution->common} <strong>%s</strong>";
+$lang->execution->cancelCopy           = 'Cancel Copy';
+$lang->execution->byPeriod             = 'By Time';
+$lang->execution->byUser               = 'By User';
+$lang->execution->noExecution          = "No {$lang->executionCommon}. ";
+$lang->execution->noExecutions         = "No {$lang->execution->common}.";
+$lang->execution->noPrintData          = "No data can be printed.";
+$lang->execution->noMembers            = 'No team members yet. ';
+$lang->execution->workloadTotal        = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
+// $lang->execution->linkProjectStoryTip  = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
+$lang->execution->linkAllStoryTip      = "({$lang->SRCommon} has never been linked under the execution, and can be directly linked with {$lang->SRCommon} of the product linked with the sprint/stage)";
 if($config->systemMode == 'classic') $lang->execution->copyTeamTitle = "Choose a {$lang->execution->common} Team to copy.";
 if($config->systemMode == 'new')     $lang->execution->copyTeamTitle = "Choose a {$lang->project->common} or {$lang->execution->common} Team to copy.";
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index a0c9e7da30..1fb284b69b 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -105,7 +105,6 @@ js::set('priv',
 js::set('hasStoryButton', $hasStoryButton);
 js::set('hasBugButton', $hasBugButton);
 js::set('hasTaskButton', $hasTaskButton);
-js::set('branch', $branchID);
 ?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
@@ -221,7 +220,7 @@ js::set('branch', $branchID);
   </div>
 </div>
 <?php endif;?>
-<?php js::set('execution',$execution->id);?>
+<?php js::set('executionID',$execution->id);?>
 <div class="modal fade" id="linkStoryByPlan">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">

From b534aeb89d1f0a6e4cd1ea8eb323a02ae98886a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:26:02 +0800
Subject: [PATCH 17/22] *

---
 module/story/control.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 24dee30e23..ee195dc703 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -431,7 +431,6 @@ class story extends control
                 foreach($mails as $story) $products[$story->storyID] = $productID;
                 $this->execution->linkStory($executionID, $stories, $products, $extra);
                 if($executionID != $this->session->project) $this->execution->linkStory($this->session->project, $stories, $products);
-                return print(js::reload('parent.parent'));
             }
 
             /* If storyID not equal zero, subdivide this story to child stories and close it. */

From 51b7e615e0f0bed07e35cab18fba9d36af0b2057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:30:20 +0800
Subject: [PATCH 18/22] *

---
 module/execution/view/kanban.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 1fb284b69b..bfeea1feec 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -49,6 +49,7 @@ js::set('colorList', $this->config->kanban->cardColorList);
 js::set('projectID', $projectID);
 js::set('vision', $this->config->vision);
 js::set('productCount', count($allProducts));
+js::set('executionID',$execution->id);
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
 $canEditRegion       = commonModel::hasPriv('kanban', 'editRegion');
@@ -220,7 +221,6 @@ js::set('hasTaskButton', $hasTaskButton);
   </div>
 </div>
 <?php endif;?>
-<?php js::set('executionID',$execution->id);?>
 <div class="modal fade" id="linkStoryByPlan">
   <div class="modal-dialog mw-500px">
     <div class="modal-content">

From fa34d9e0242a5b63518b3bc171393ac7fec1d57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 11:31:50 +0800
Subject: [PATCH 19/22] *

---
 module/execution/view/kanban.html.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index bfeea1feec..f3369925a6 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -166,11 +166,14 @@ js::set('hasTaskButton', $hasTaskButton);
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
         <?php
-            if($canBatchCreateStory)
+        if($canBatchCreateStory)
+        {
+            if(count($allProducts)>1)
             {
-                if(count($allProducts)>1)
                 echo '<li>' . html::a('#batchCreateStory', $lang->execution->batchCreateStory, '', 'data-toggle="modal"') . '</li>';
-                else
+            }
+            else
+            {
                 echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';
             }
         ?>

From 03b0221c991faaef67790f7af5192db691d1afee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 13:08:22 +0800
Subject: [PATCH 20/22] *

---
 module/execution/view/kanban.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index f3369925a6..fcfc047519 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -49,7 +49,7 @@ js::set('colorList', $this->config->kanban->cardColorList);
 js::set('projectID', $projectID);
 js::set('vision', $this->config->vision);
 js::set('productCount', count($allProducts));
-js::set('executionID',$execution->id);
+js::set('executionID', $execution->id);
 
 $canSortRegion       = commonModel::hasPriv('kanban', 'sortRegion') && count($regions) > 1;
 $canEditRegion       = commonModel::hasPriv('kanban', 'editRegion');
@@ -176,6 +176,7 @@ js::set('hasTaskButton', $hasTaskButton);
             {
                 echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStory, '', "class='iframe' data-width='90%'") . '</li>';
             }
+        }
         ?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>

From aeaf87793390bafe584b972321b8677b10b6a8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=8E=89=E6=98=A5?= <563917701@qq.com>
Date: Wed, 2 Mar 2022 05:11:04 +0000
Subject: [PATCH 21/22] Update kanban.js

---
 module/execution/js/kanban.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 9a60c6d85b..416a3873e6 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -7,6 +7,7 @@ $(function()
         $('#batchCreateStoryButton').attr('href',attr);
     });
 })
+
 /**
  * When execution status change.
  *

From e7d721af855e5f2f1c4c0a70a8237cd8acecd040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Wed, 2 Mar 2022 13:15:04 +0800
Subject: [PATCH 22/22] *

---
 module/execution/control.php          | 2 +-
 module/execution/view/kanban.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index aecafc05ca..9893ea74d8 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2083,7 +2083,7 @@ class execution extends control
         $this->view->productID        = $productID;
         $this->view->branchID         = $branchID;
         $this->view->projectID        = $this->loadModel('task')->getProjectID($execution->id);
-        $this->view->allProducts      = $this->loadModel('product')->getProductPairsByProject($this->view->projectID, 'noclosed');
+        $this->view->allProducts      = $this->product->getProductPairsByProject($this->view->projectID, 'noclosed');
         $this->view->allPlans         = $allPlans;
         $this->view->kanbanData       = $kanbanData;
         $this->view->executionActions = $executionActions;
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index fcfc047519..7f2333337e 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -168,7 +168,7 @@ js::set('hasTaskButton', $hasTaskButton);
         <?php
         if($canBatchCreateStory)
         {
-            if(count($allProducts)>1)
+            if(count($allProducts) > 1)
             {
                 echo '<li>' . html::a('#batchCreateStory', $lang->execution->batchCreateStory, '', 'data-toggle="modal"') . '</li>';
             }