From 52c59a98e0f69a3432df08aa2eff0fde88f44860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Mon, 21 Nov 2022 14:25:46 +0800
Subject: [PATCH 1/3]  * fix bug #30005.

---
 module/product/view/all.html.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 09d5aca48b..954ad0b0b8 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -51,7 +51,9 @@
             </th>
             <?php endif;?>
             <th class='table-nest-title text-left c-name' rowspan="2">
+              <?php if($config->systemMode == 'ALM'):?>
               <a class='table-nest-toggle table-nest-toggle-global' data-expand-text='<?php echo $lang->expand; ?>' data-collapse-text='<?php echo $lang->collapse; ?>'></a>
+              <?php endif;?>
               <?php common::printOrderLink('name', $orderBy, $vars, $lang->product->name);?>
             </th>
             <th class='c-PO' rowspan="2">

From d30344e2cadefe9837b8ab09a2f7697dcd6fad6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= <wangyidong@cnezsoft.com>
Date: Tue, 22 Nov 2022 09:00:23 +0800
Subject: [PATCH 2/3]  * fix bug #29555.

---
 module/testcase/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index 0c2fe2d24d..43aec7ec88 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -2452,13 +2452,13 @@ class testcaseModel extends model
                 {
                     $menu .= $this->buildMenu('testtask', 'runCase', "$extraParams&version=$case->currentVersion", $case, 'view', 'play', '', 'showinonlybody', false, "data-width='95%'");
                     $menu .= $this->buildMenu('testtask', 'results', "$extraParams&version=$case->version",        $case, 'view', '', '', 'showinonlybody', false, "data-width='95%'");
-                    $menu .= $this->buildMenu('testcase', 'importToLib', $params,                                  $case, 'view', 'assets', '', 'showinonlybody iframe', true, "data-width='500px'");
+                    if(!isonlybody()) $menu .= $this->buildMenu('testcase', 'importToLib', $params,                $case, 'view', 'assets', '', 'showinonlybody iframe', true, "data-width='500px'");
                 }
                 else
                 {
                     $menu .= $this->buildMenu('testtask', 'runCase', "$extraParams&version=$case->currentVersion", $case, 'view', 'play', '', 'showinonlybody iframe', false, "data-width='95%'");
                     $menu .= $this->buildMenu('testtask', 'results', "$extraParams&version=$case->version",        $case, 'view', '', '', 'showinonlybody iframe', false, "data-width='95%'");
-                    $menu .= $this->buildMenu('testcase', 'importToLib', $params,                                  $case, 'view', 'assets', '', 'showinonlybody iframe', true, "data-width='500px'");
+                    if(!isonlybody()) $menu .= $this->buildMenu('testcase', 'importToLib', $params,                $case, 'view', 'assets', '', 'showinonlybody iframe', true, "data-width='500px'");
                 }
                 if($case->caseFails > 0)
                 {

From 74f26f478f4d1b6f495bc3204049f2e5daf4761a Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.com>
Date: Tue, 22 Nov 2022 09:15:08 +0800
Subject: [PATCH 3/3] * Fix bug #28841.

---
 module/story/view/edit.html.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 96697c0fab..a201e015ef 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -204,6 +204,26 @@
                   <?php echo html::hidden('status', $story->status);?>
                 </td>
               </tr>
+              <?php if($story->type == 'story'):?>
+              <tr>
+                <th><?php echo $lang->story->stage;?></th>
+                <td>
+                <?php
+                if($story->stages and $branchTagOption)
+                {
+                    foreach($story->stages as $branch => $stage)
+                    {
+                        if(isset($branchTagOption[$branch])) echo '<p>' . $branchTagOption[$branch] . html::select("stages[$branch]", $lang->story->stageList, $stage, "class='form-control chosen'") . '</p>';
+                    }
+                }
+                else
+                {
+                    echo html::select('stage', $lang->story->stageList, $story->stage, "class='form-control chosen'");
+                }
+                ?>
+                </td>
+              </tr>
+              <?php endif;?>
               <tr>
                 <th><?php echo $lang->story->category;?></th>
                 <td><?php echo html::select('category', $lang->story->categoryList, $story->category, "class='form-control chosen'");?></td>