From 76a2357f564244a8f5a42536c4c5ccb97c405a4c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:12:20 +0800
Subject: [PATCH 1/5] * Fix bug #29973.

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

diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php
index d6b5517f4a..ad182f5974 100644
--- a/module/design/view/linkcommit.html.php
+++ b/module/design/view/linkcommit.html.php
@@ -74,7 +74,9 @@
       </tbody>
     </table>
     <div class='table-footer'>
+      <?php if(!empty($revisions)):?>
       <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+      <?php endif;?>
       <div class="table-actions btn-toolbar">
         <?php echo html::submitButton('', '', 'btn btn-primary')?>
       </div>

From 5a0280b50629d1162990c29bfeb961d3b16334f5 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:22:08 +0800
Subject: [PATCH 2/5] * Fix bug #29923.

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

diff --git a/module/story/view/linkstories.html.php b/module/story/view/linkstories.html.php
index 587eb6d437..4ba1901542 100644
--- a/module/story/view/linkstories.html.php
+++ b/module/story/view/linkstories.html.php
@@ -16,7 +16,7 @@
   <div class='main-header'>
     <h2>
       <span class='label label-id'><?php echo $story->id;?></span>
-      <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id"), $story->title, '_blank', "title='$story->title'");?>
+      <?php echo $story->title;?>
       <?php $title = $story->type == 'story' ? $lang->story->linkStoriesAB : $lang->story->linkRequirementsAB?>
       <small class='text-muted'> <?php echo $lang->arrow . $title;?></small>
     </h2>

From 6faaaf865cb0aee1e3fae26f520c32e7ad492a7c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:24:41 +0800
Subject: [PATCH 3/5] * Fix bug #29847.

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

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index cc9427c527..f09acee452 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -184,9 +184,6 @@
   </div>
   <div class="main-col">
     <div id='queryBox' data-module='executionStory' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
-      <div class="table-header fixed-right">
-        <nav class="btn-toolbar pull-right setting"></nav>
-      </div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
@@ -217,6 +214,9 @@
       </p>
     </div>
     <?php else:?>
+    <div class="table-header fixed-right">
+      <nav class="btn-toolbar pull-right setting"></nav>
+    </div>
     <form class='main-table table-story skip-iframe-modal' method='post' id='executionStoryForm'>
       <?php
       $datatableId  = $this->moduleName . ucfirst($this->methodName);

From e0b893114e8b29a125b710449b806ac54f7be6ac Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:46:06 +0800
Subject: [PATCH 4/5] * Fix bug #29842.

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

diff --git a/module/testcase/view/zerocase.html.php b/module/testcase/view/zerocase.html.php
index bdd7e01b09..18279dadad 100644
--- a/module/testcase/view/zerocase.html.php
+++ b/module/testcase/view/zerocase.html.php
@@ -139,7 +139,8 @@
 
         if(common::hasPriv('story', 'batchChangeStage'))
         {
-            echo "<div class='btn-group dropup'>";
+            $class = count($stories) <= 3 ? 'dropdown' : 'dropup';
+            echo "<div class='btn-group $class'>";
             echo html::commonButton($lang->story->stageAB . "<span class='caret'></span>", "data-toggle='dropdown'");
             echo "<ul class='dropdown-menu'>";
             $lang->story->stageList[''] = $lang->null;

From 37c83b3d36b75caa8b6880e096223df5a72ae374 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Fri, 18 Nov 2022 14:58:10 +0800
Subject: [PATCH 5/5] * Fix bug #29714.

---
 module/block/view/waterfallganttblock.html.php | 2 +-
 module/programplan/model.php                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/block/view/waterfallganttblock.html.php b/module/block/view/waterfallganttblock.html.php
index 672dfa6916..68b5c3132e 100644
--- a/module/block/view/waterfallganttblock.html.php
+++ b/module/block/view/waterfallganttblock.html.php
@@ -124,7 +124,7 @@
         {
             plan.progress = !plan.tasks.length ? 0 : plan.progress / plan.tasks.length;
             var $plan = $('<div class="gantt-plan"></div>');
-            $plan.append('<div class="strong" title="' + plan.text + '">' + plan.text + '</div>');
+            $plan.append('<div class="strong" title="' + plan.name + '">' + plan.text + '</div>');
             $plans.append($plan);
 
             var $bar = $('<div class="gantt-bar"></div>');
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 3402e2c654..cf547525d6 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -187,6 +187,7 @@ class programplanModel extends model
             $data->id            = $plan->id;
             $data->type          = 'plan';
             $data->text          = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone ;
+            $data->name          = $plan->name;
             $data->percent       = $plan->percent;
             $data->attribute     = zget($this->lang->stage->typeList, $plan->attribute);
             $data->milestone     = zget($this->lang->programplan->milestoneList, $plan->milestone);