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

* Fix bug #16190.

Browse Source
This commit is contained in:
tianshujie
2021-11-12 13:19:18 +08:00
parent 44bfbb7cdc
commit 54d69e1969
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/model.php
+2 -2
View File
@@ -226,13 +226,13 @@ class productplanModel extends model
* @access public
* @return array
*/
public function getPairsForStory($product = 0, $branch = '', $skipParent = false)
public function getPairsForStory($product = 0, $branch = 0, $skipParent = false)
{
$date = date('Y-m-d');
$plans = $this->dao->select('id,title,parent,begin,end')->from(TABLE_PRODUCTPLAN)
->where('product')->in($product)
->andWhere('deleted')->eq(0)
->beginIF($branch !== '')->andWhere("branch")->eq($branch)->fi()
->beginIF($branch)->andWhere("branch")->in("0,$branch")->fi()
->beginIF($skipParent)->andWhere('parent')->ne(-1)->fi()
->orderBy('begin desc')
->fetchAll('id');
module/story/control.php
+7 -14
View File
@@ -456,21 +456,14 @@ class story extends control
$this->view->titles = $titles;
}
$this->loadModel('productplan');
if($branch == BRANCH_MAIN)
{
$plans = $this->productplan->getPairsForStory($productID, '', true);
}
else
{
$plans = $this->productplan->getPairsForStory($productID, 0, true);
$plans += $this->productplan->getPairsForStory($productID, $branch, true);
}
$moduleOptionMenu['ditto'] = $this->lang->story->ditto;
$plans['ditto'] = $this->lang->story->ditto;
$priList = (array)$this->lang->story->priList;
$priList['ditto'] = $this->lang->story->ditto;
$plans = $this->loadModel('productplan')->getPairsForStory($productID, $branch === 'all' ? 0 : $branch, true);
$plans['ditto'] = $this->lang->story->ditto;
$priList = (array)$this->lang->story->priList;
$priList['ditto'] = $this->lang->story->ditto;
$sourceList = (array)$this->lang->story->sourceList;
$sourceList['ditto'] = $this->lang->story->ditto;