From ecf749b7da013b61afa0566314cde170e2069b31 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Tue, 29 Mar 2022 16:59:33 +0800
Subject: [PATCH 1/6] * Fix bug #18002.

---
 module/execution/control.php              | 12 +++++++++++-
 module/execution/view/task.html.php       | 12 +++++++-----
 module/execution/view/taskkanban.html.php | 22 +++++++++++++++++-----
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index d4ef2cbb54..83d8747b15 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2131,6 +2131,7 @@ class execution extends control
      */
     public function taskKanban($executionID, $browseType = '', $orderBy = 'order_asc', $groupBy = '')
     {
+        $execution = $this->loadModel('execution')->getById($executionID);
         if(empty($browseType)) $browseType = $this->session->kanbanType ? $this->session->kanbanType : 'all';
         if(empty($groupBy)) $groupBy = 'default';
 
@@ -2148,7 +2149,16 @@ class execution extends control
         /* Compatibility IE8. */
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
-        $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy);
+        if($execution->lifetime == 'ops')
+        {
+            unset($this->lang->kanban->type['story']);
+            unset($this->lang->kanban->type['bug']);
+            $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, 'task', $groupBy);
+        }
+        else
+        {
+            $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy);
+        }
         if(empty($kanbanGroup))
         {
             $this->kanban->createExecutionLane($executionID, $browseType, $groupBy);
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 1681e153bc..bf0aa62c49 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -132,11 +132,13 @@ body {margin-bottom: 25px;}
         $misc  = common::hasPriv('execution', 'importTask') ? "class='import'" : "class=disabled";
         $link  = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $class>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
-
-        $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
-        $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
-        $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
-        echo "<li $class>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        if($execution->lifetime != 'ops')
+        {
+            $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
+            $misc  = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled";
+            $link  = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
+            echo "<li $class>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        }
         ?>
       </ul>
     </div>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 0c16c7506e..86e9009b3e 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -13,7 +13,14 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class="input-control space c-type">
-      <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
+      <?php
+      if($execution->lifetime == 'ops')
+      {
+          unset($lang->kanban->type['story']);
+          unset($lang->kanban->type['bug']);
+      }
+      echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');
+      ?>
     </div>
     <?php if($browseType != 'all'):?>
     <div class="input-control space c-group">
@@ -49,9 +56,12 @@
         $link = common::hasPriv('execution', 'importTask') ?  $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $misc>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
 
-        $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
-        $link = common::hasPriv('execution', 'importBug') ?  $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
-        echo "<li $misc>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        if($execution->lifetime != 'ops')
+        {
+            $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
+            $link = common::hasPriv('execution', 'importBug') ?  $this->createLink('execution', 'importBug', "execution=$execution->id") : '#';
+            echo "<li $misc>" . html::a($link, $lang->execution->importBug, '', $misc) . "</li>";
+        }
         ?>
       </ul>
     </div>
@@ -90,6 +100,7 @@
     <div class='dropdown' id='createDropdown'>
       <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($execution->lifetime != 'ops'):?>
         <?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->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>';?>
@@ -103,9 +114,10 @@
             echo $batchCreateBugLink;
         }?>
         <?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
+        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe'") . '</li>';?>
+        <?php endif;?>
         <?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '</li>';?>
-        <?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "execution=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe'") . '</li>';?>
       </ul>
     </div>
     <?php endif;?>

From 6b9eddc355dba95084f57d7d8015e7e6a5cfa248 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 30 Mar 2022 09:35:59 +0800
Subject: [PATCH 2/6] * Fix bug #18002.

---
 module/execution/control.php              | 10 +++++-----
 module/execution/view/taskkanban.html.php |  9 +--------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 83d8747b15..c8b48d451b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2145,20 +2145,20 @@ class execution extends control
         $this->app->loadLang('story');
         $this->app->loadLang('task');
         $this->app->loadLang('bug');
+        $this->loadModel('kanban');
 
         /* Compatibility IE8. */
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
         if($execution->lifetime == 'ops')
         {
+            $browseType = 'task';
             unset($this->lang->kanban->type['story']);
             unset($this->lang->kanban->type['bug']);
-            $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, 'task', $groupBy);
-        }
-        else
-        {
-            $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy);
+            unset($this->lang->kanban->type['all']);
         }
+
+        $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         if(empty($kanbanGroup))
         {
             $this->kanban->createExecutionLane($executionID, $browseType, $groupBy);
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 86e9009b3e..2f4a0d4a2a 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -13,14 +13,7 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class="input-control space c-type">
-      <?php
-      if($execution->lifetime == 'ops')
-      {
-          unset($lang->kanban->type['story']);
-          unset($lang->kanban->type['bug']);
-      }
-      echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');
-      ?>
+      <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
     <?php if($browseType != 'all'):?>
     <div class="input-control space c-group">

From c86e39c093cf0ea04f2073c71a245223a722cf3c Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 30 Mar 2022 14:26:24 +0800
Subject: [PATCH 3/6] * Fix bug #18002 #19684.

---
 module/execution/control.php | 5 +++++
 module/kanban/model.php      | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index c8b48d451b..defae0bac5 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2158,6 +2158,11 @@ class execution extends control
             unset($this->lang->kanban->type['all']);
         }
 
+        if($execution->type == 'stage' and $execution->attribute != 'dev')
+        {
+            unset($this->lang->kanban->type['task']);
+        }
+
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         if(empty($kanbanGroup))
         {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 3646c208db..01357a147d 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1316,12 +1316,15 @@ class kanbanModel extends model
      */
     public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
     {
+        $execution = $this->loadModel('execution')->getById($executionID);
+
         if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
 
         $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)
             ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
+            ->beginIF($execution->type == 'stage' and $execution->attribute != 'dev')->andWhere('type')->ne('task')->fi()
             ->orderBy('order_asc')
             ->fetchAll('id');
 

From 79d9664263673a318e1e1efa8b1ac9deb9f9138e Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 30 Mar 2022 20:48:33 +0800
Subject: [PATCH 4/6] * Fix bug#18002.

---
 module/execution/control.php        | 9 +++------
 module/execution/view/task.html.php | 1 +
 module/kanban/model.php             | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index defae0bac5..1ba865bf66 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2131,7 +2131,6 @@ class execution extends control
      */
     public function taskKanban($executionID, $browseType = '', $orderBy = 'order_asc', $groupBy = '')
     {
-        $execution = $this->loadModel('execution')->getById($executionID);
         if(empty($browseType)) $browseType = $this->session->kanbanType ? $this->session->kanbanType : 'all';
         if(empty($groupBy)) $groupBy = 'default';
 
@@ -2150,6 +2149,8 @@ class execution extends control
         /* Compatibility IE8. */
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
+        $this->execution->setMenu($executionID);
+        $execution = $this->execution->getById($executionID);
         if($execution->lifetime == 'ops')
         {
             $browseType = 'task';
@@ -2157,8 +2158,7 @@ class execution extends control
             unset($this->lang->kanban->type['bug']);
             unset($this->lang->kanban->type['all']);
         }
-
-        if($execution->type == 'stage' and $execution->attribute != 'dev')
+        elseif($execution->type == 'stage' and $execution->attribute != 'dev')
         {
             unset($this->lang->kanban->type['task']);
         }
@@ -2170,9 +2170,6 @@ class execution extends control
             $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         }
 
-        $this->execution->setMenu($executionID);
-        $execution = $this->loadModel('execution')->getById($executionID);
-
         /* Determines whether an object is editable. */
         $canBeChanged = common::canModify('execution', $execution);
 
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index bf0aa62c49..dbfdadd784 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -132,6 +132,7 @@ body {margin-bottom: 25px;}
         $misc  = common::hasPriv('execution', 'importTask') ? "class='import'" : "class=disabled";
         $link  = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#';
         echo "<li $class>" . html::a($link, $lang->execution->importTask, '', $misc) . "</li>";
+
         if($execution->lifetime != 'ops')
         {
             $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled";
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 01357a147d..746b3638ec 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1316,10 +1316,9 @@ class kanbanModel extends model
      */
     public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
     {
-        $execution = $this->loadModel('execution')->getById($executionID);
-
         if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
 
+        $execution = $this->loadModel('execution')->getById($executionID);
         $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)

From fb5a792fee65a57dea4dde05a7e00c72b0a4ad72 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 31 Mar 2022 10:05:31 +0800
Subject: [PATCH 5/6] * Fix bug #18002.

---
 module/execution/control.php | 4 ----
 module/kanban/model.php      | 1 -
 2 files changed, 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 1ba865bf66..6fcab91979 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2158,10 +2158,6 @@ class execution extends control
             unset($this->lang->kanban->type['bug']);
             unset($this->lang->kanban->type['all']);
         }
-        elseif($execution->type == 'stage' and $execution->attribute != 'dev')
-        {
-            unset($this->lang->kanban->type['task']);
-        }
 
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
         if(empty($kanbanGroup))
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 746b3638ec..949366368b 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1323,7 +1323,6 @@ class kanbanModel extends model
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)
             ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
-            ->beginIF($execution->type == 'stage' and $execution->attribute != 'dev')->andWhere('type')->ne('task')->fi()
             ->orderBy('order_asc')
             ->fetchAll('id');
 

From 16e62835ae6cb26549b835ba1824d89890e7cc02 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 31 Mar 2022 10:06:58 +0800
Subject: [PATCH 6/6] * Fix bug #18002.

---
 module/kanban/model.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index 949366368b..3646c208db 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1318,7 +1318,6 @@ class kanbanModel extends model
     {
         if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
 
-        $execution = $this->loadModel('execution')->getById($executionID);
         $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
             ->where('execution')->eq($executionID)
             ->andWhere('deleted')->eq(0)