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 @@ edition == 'max'):?> - revisions as $revision => $repoID):?> + revisions as $revision => $repoComment):?> createLink('design', 'revision', "repoID=$revision"), '#'. $revision, '', "data-app='devops'") . '
'; + echo html::a($this->createLink('design', 'revision', "repoID=$revision"), '#'. $revision . '-' . $repoComment, '', "data-app='devops'") . '
'; ?> 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(); +})