From 6fb473eeea9c31bf3c8f2463d730266349355b4b Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 1 Mar 2023 14:31:40 +0800
Subject: [PATCH 1/4] * Fix bug #32549.

---
 module/admin/model.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/admin/model.php b/module/admin/model.php
index c23ea0103c..ab203c223a 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -521,11 +521,14 @@ class adminModel extends model
             $searchType = $type == 'plugin' ? 'byUpdatedTime,offcial' : 'byModule';
             $param      = $type == 'plugin' ? '' : 'MTIxOA==';
             $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit);
-            $plugins    = isset($extensions->extensions) ? (array)$extensions->extensions : array();
-            foreach($plugins as $id => $plugin)
+            $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array();
+            $plugins    = array();
+            foreach($extensions as $extension)
             {
-                $plugin->viewLink = str_replace(array('info', 'client'), '', $plugin->viewLink);
-                if($type == 'patch' and !isset($plugin->compatibleRelease)) unset($plugins[$id]);
+                if($type == 'patch' and !isset($extension->compatibleRelease)) continue;
+
+                $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink);
+                $plugins[] = $extension;
             }
         }
         else

From fdc0e3fa41c312aedd3b054ef8bef2bcef2f12cd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 15:56:55 +0800
Subject: [PATCH 2/4] * Code for fix bug #32567.

---
 module/programplan/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 8f68042399..cab364b73f 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -715,7 +715,7 @@ class programplanModel extends model
 
         $project   = $this->loadModel('project')->getByID($projectID);
         $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
-        $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '');
+        $sameCodes = $setCode ? $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '') : false;
 
         $datas = array();
         foreach($names as $key => $name)

From f159017f4548e97b3625140f321084ea91b03d61 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 16:22:34 +0800
Subject: [PATCH 3/4] * Code for fix bug #32562.

---
 module/execution/control.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 649664c636..839b334141 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2629,11 +2629,14 @@ class execution extends control
         $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
         $this->session->set('rdSearchValue', '');
-        $this->session->set('execLaneType', $browseType);
 
         $features   = $this->execution->getExecutionFeatures($execution);
         $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy);
 
+        /* Set lane type. */
+        if(!$features['story'] and !$features['qa']) $browseType = 'task';
+        $this->session->set('execLaneType', $browseType);
+
         /* Remove lanes if no feature. */
         foreach($kanbanData as $regionID => $region)
         {
@@ -2732,7 +2735,6 @@ class execution extends control
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList', $uri, 'execution');
         $this->app->session->set('bugList',  $uri, 'qa');
-        $this->app->session->set('execLaneType', $browseType);
         $this->app->session->set('execGroupBy', $groupBy);
 
         /* Load language. */
@@ -2751,6 +2753,8 @@ class execution extends control
             unset($this->lang->kanban->group->task['story']);
         }
 
+        $this->app->session->set('execLaneType', $browseType);
+
         if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
         $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
 

From 046187237ec2b731653cebfa5494b270b096f56c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Mar 2023 16:35:24 +0800
Subject: [PATCH 4/4] * Code for fix bug #32561.

---
 module/build/view/view.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php
index 138180d569..7c8103e77c 100644
--- a/module/build/view/view.html.php
+++ b/module/build/view/view.html.php
@@ -385,7 +385,10 @@ tbody tr td:first-child input {display: none;}
                 <?php if($build->execution):?>
                 <tr>
                   <th><?php echo empty($multipleProject) ? $lang->build->project :($executionType ? $lang->build->executionAB : $lang->build->execution);?></th>
-                  <td><?php echo zget($executions, $build->execution);?></td>
+                  <td>
+                    <?php $executionName = zget($executions, $build->execution);?>
+                    <?php echo ltrim($executionName, '/');?>
+                  </td>
                 </tr>
                 <?php else:?>
                 <tr>