From c480a5203ccd34d16883d95084593377083dbd41 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 25 Apr 2022 13:52:37 +0800
Subject: [PATCH 1/2] * fix bug #16663

---
 module/story/model.php           | 18 ++++++++++--------
 module/story/view/track.html.php |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 9cae0c63fd..0870db538a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4286,10 +4286,11 @@ class storyModel extends model
                             ->where('story')->eq($id)
                             ->andWhere('deleted')->eq('0')
                             ->fetchAll('id');
-                        $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
-                            ->where('AType')->eq('design')
-                            ->andWhere('BType')->eq('commit')
-                            ->andWhere('AID')->in(array_keys($stories[$id]->designs))
+                        $stories[$id]->revisions = $this->dao->select('BID, t2.comment')->from(TABLE_RELATION)->alias('t1')
+                            ->leftjoin(TABLE_REPOHISTORY)->alias('t2')->on('t1.BID = t2.id')
+                            ->where('t1.AType')->eq('design')
+                            ->andWhere('t1.BType')->eq('commit')
+                            ->andWhere('t1.AID')->in(array_keys($stories[$id]->designs))
                             ->fetchPairs();
                     }
                 }
@@ -4359,10 +4360,11 @@ class storyModel extends model
                         ->where('story')->eq($id)
                         ->andWhere('deleted')->eq('0')
                         ->fetchAll('id');
-                    $stories[$id]->revisions = $this->dao->select('BID, extra')->from(TABLE_RELATION)
-                        ->where('AType')->eq('design')
-                        ->andWhere('BType')->eq('commit')
-                        ->andWhere('AID')->in(array_keys($stories[$id]->designs))
+                    $stories[$id]->revisions = $this->dao->select('BID, t2.comment')->from(TABLE_RELATION)->alias('t1')
+                        ->leftjoin(TABLE_REPOHISTORY)->alias('t2')->on('t1.BID = t2.id')
+                        ->where('t1.AType')->eq('design')
+                        ->andWhere('t1.BType')->eq('commit')
+                        ->andWhere('t1.AID')->in(array_keys($stories[$id]->designs))
                         ->fetchPairs();
                 }
             }
diff --git a/module/story/view/track.html.php b/module/story/view/track.html.php
index f72d8ea80e..734e04d856 100644
--- a/module/story/view/track.html.php
+++ b/module/story/view/track.html.php
@@ -107,9 +107,9 @@
               </td>
               <?php if($config->edition == 'max'):?>
               <td>
-                <?php foreach($story->revisions as $revision => $repoID):?>
+                <?php foreach($story->revisions as $revision => $repoComment):?>
                 <?php
-                echo html::a($this->createLink('design', 'revision', "repoID=$revision"), '#'. $revision, '', "data-app='devops'") . '<br/>';
+                echo html::a($this->createLink('design', 'revision', "repoID=$revision"), '#'. $revision . '-' . $repoComment, '', "data-app='devops'") . '<br/>';
                 ?>
                 <?php endforeach;?>
               </td>

From beb2ec67de788f35ffc398d7d69aa82be8bb713a Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Mon, 25 Apr 2022 17:11:13 +0800
Subject: [PATCH 2/2] * fix bug #17626

---
 module/testsuite/js/view.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 module/testsuite/js/view.js

diff --git a/module/testsuite/js/view.js b/module/testsuite/js/view.js
new file mode 100644
index 0000000000..7cb0a3d2d1
--- /dev/null
+++ b/module/testsuite/js/view.js
@@ -0,0 +1,4 @@
+$(function()
+{
+    $("#mainMenu .pull-right .divider:first").remove();
+})