Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

Browse Source 
* fix bug #16663#17626

See merge request easycorp/zentaopms!3108
This commit is contained in:
王怡栋
2022-04-25 09:22:47 +00:00
parent f208fcea12 beb2ec67de
commit f76be66917
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+10 -8
View File
@@ -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();
}
}
module/story/view/track.html.php
+2 -2
View File
@@ -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>
module/testsuite/js/view.js
+4
View File
@@ -0,0 +1,4 @@
$(function()
{
$("#mainMenu .pull-right .divider:first").remove();
})