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

Merge branch 'ticket_329' into 'master'

Browse Source 
Ticket 329

See merge request easycorp/zentaopms!6886
This commit is contained in:
王怡栋
2023-02-08 08:28:54 +00:00
parent 6cc3863a63 7342444023
commit 2a6360f45f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -2
View File
@@ -565,8 +565,9 @@ class bug extends control
}
else
{
$builds = $this->loadModel('build')->getBuildPairs($productID, $branch, 'noempty,noterminate,nodone,withbranch,noreleased');
$stories = $this->story->getProductStoryPairs($productID, $branch, 0, 'all','id_desc', 0, 'full', 'story', false);
$moduleID = $moduleID ? $moduleID : 0;
$builds = $this->loadModel('build')->getBuildPairs($productID, $branch, 'noempty,noterminate,nodone,withbranch,noreleased');
$stories = $this->story->getProductStoryPairs($productID, $branch, $moduleID, 'all','id_desc', 0, 'full', 'story', false);
}
$moduleOwner = $this->bug->getModuleOwner($moduleID, $productID);
module/story/model.php
+5
View File
@@ -3022,6 +3022,11 @@ class storyModel extends model
*/
public function getProductStoryPairs($productID = 0, $branch = 'all', $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0, $type = 'full', $storyType = 'story', $hasParent = true)
{
if($moduleIdList)
{
$moduleInfo = $this->loadModel('tree')->getByID($moduleIdList);
$moduleIdList = $moduleInfo->type == 'bug' ? 0 : $moduleIdList;
}
$stories = $this->dao->select('t1.id, t1.title, t1.module, t1.pri, t1.estimate, t2.name AS product')
->from(TABLE_STORY)->alias('t1')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->where('1=1')