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

* Remove branch param for storyModel getExecutionStories method.

Browse Source
This commit is contained in:
wangyidong
2023-05-12 09:46:05 +08:00
parent 52454e6dad
commit ae25ef94dc
7 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/control.php
+1 -1
View File
@@ -674,7 +674,7 @@ class build extends control
}
else
{
$allStories = $this->story->getExecutionStories($executionID, $build->product, 0, 't1.`order`_desc', 'byBranch', $build->branch, 'story', $build->allStories, $pager);
$allStories = $this->story->getExecutionStories($executionID, $build->product, 't1.`order`_desc', 'byBranch', $build->branch, 'story', $build->allStories, $pager);
}
$this->view->allStories = $allStories;
module/execution/control.php
+2 -2
View File
@@ -825,7 +825,7 @@ class execution extends control
if($this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
$stories = $this->story->getExecutionStories($executionID, 0, 0, $sort, $type, $param, $storyType, '', $pager);
$stories = $this->story->getExecutionStories($executionID, 0, $sort, $type, $param, $storyType, '', $pager);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
@@ -2973,7 +2973,7 @@ class execution extends control
if($_POST)
{
$stories = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, $orderBy);
$stories = $this->loadModel('story')->getExecutionStories($executionID, 0, $orderBy);
$storySpecs = $this->story->getStorySpecs(array_keys($stories));
$order = 1;
module/execution/test/execution.class.php
+1 -1
View File
@@ -2565,7 +2565,7 @@ class executionTest
{
global $tester;
$contents = array('story', 'wait', 'doing', 'done', 'cancel');
$stories = $tester->loadModel('story')->getExecutionStories($executionID, 0, 0, 'id_asc');
$stories = $tester->loadModel('story')->getExecutionStories($executionID, 0, 'id_asc');
$kanbanTasks = $this->executionModel->getKanbanTasks($executionID, "id");
$kanbanBugs = $tester->loadModel('bug')->getExecutionBugs($executionID);
$users = array();
module/kanban/model.php
+4 -4
View File
@@ -1394,7 +1394,7 @@ class kanbanModel extends model
->fetchgroup('lane', 'column');
/* Get group objects. */
if($browseType == 'all' or $browseType == 'story') $objectGroup['story'] = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'all' or $browseType == 'story') $objectGroup['story'] = $this->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'all' or $browseType == 'bug') $objectGroup['bug'] = $this->loadModel('bug')->getExecutionBugs($executionID);
if($browseType == 'all' or $browseType == 'task') $objectGroup['task'] = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
@@ -1483,7 +1483,7 @@ class kanbanModel extends model
->fetchGroup('lane', 'id');
/* Get group objects. */
if($browseType == 'all' or $browseType == 'story') $objectGroup['story'] = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'all' or $browseType == 'story') $objectGroup['story'] = $this->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'all' or $browseType == 'bug') $objectGroup['bug'] = $this->loadModel('bug')->getExecutionBugs($executionID);
if($browseType == 'all' or $browseType == 'task') $objectGroup['task'] = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
@@ -1594,7 +1594,7 @@ class kanbanModel extends model
{
/* Get card data. */
$cardList = array();
if($browseType == 'story') $cardList = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'story') $cardList = $this->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'bug') $cardList = $this->loadModel('bug')->getExecutionBugs($executionID);
if($browseType == 'task') $cardList = $this->loadModel('execution')->getKanbanTasks($executionID);
@@ -2922,7 +2922,7 @@ class kanbanModel extends model
if($laneType == 'story')
{
$stories = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory', 0, 'story', $otherCardList);
$stories = $this->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory', 0, 'story', $otherCardList);
foreach($stories as $storyID => $story)
{
foreach($this->config->kanban->storyColumnStageList as $colType => $stage)
module/kanban/test/kanban.class.php
+2 -2
View File
@@ -661,7 +661,7 @@ class kanbanTest
{
global $tester;
/* Get group objects. */
if($browseType == 'story') $cardList = $tester->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'story') $cardList = $tester->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'bug') $cardList = $tester->loadModel('bug')->getExecutionBugs($executionID);
if($browseType == 'task') $cardList = $tester->loadModel('execution')->getKanbanTasks($executionID, "id");
$objects = $this->objectModel->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
@@ -1718,7 +1718,7 @@ class kanbanTest
{
global $tester;
/* Get group objects. */
if($objecType == 'story') $objectGroup['story'] = $tester->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($objecType == 'story') $objectGroup['story'] = $tester->loadModel('story')->getExecutionStories($executionID, 0, 't1.`order`_desc', 'allStory');
if($objecType == 'bug') $objectGroup['bug'] = $tester->loadModel('bug')->getExecutionBugs($executionID);
if($objecType == 'task') $objectGroup['task'] = $tester->loadModel('execution')->getKanbanTasks($executionID, "id");
module/product/zen.php
+1 -1
View File
@@ -1257,7 +1257,7 @@ class productZen extends product
$this->products = $this->product->getProducts($projectID, 'all', '', false);
if($browseType == 'bybranch') $param = $branchID;
$stories = $this->story->getExecutionStories($projectID, $productID, $branchID, $sort, $browseType, $param, $storyType, '', $pager);
$stories = $this->story->getExecutionStories($projectID, $productID, $sort, $browseType, $param, $storyType, '', $pager);
}
else
{
module/story/model.php
+4 -5
View File
@@ -212,7 +212,6 @@ class storyModel extends model
*
* @param int $executionID
* @param int $productID
* @param string|int $branch
* @param string $orderBy
* @param string $type
* @param int|string $param
@@ -222,7 +221,7 @@ class storyModel extends model
* @access public
* @return array
*/
public function getExecutionStories(int $executionID = 0, int $productID = 0, string|int $branch = 0, string $orderBy = 't1.`order`_desc', string $type = 'byModule', string $param = '0', string $storyType = 'story', array|string $excludeStories = '', object|null $pager = null)
public function getExecutionStories(int $executionID = 0, int $productID = 0, string $orderBy = 't1.`order`_desc', string $type = 'byModule', string $param = '0', string $storyType = 'story', array|string $excludeStories = '', object|null $pager = null)
{
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getExecutionStories();
@@ -255,7 +254,7 @@ class storyModel extends model
->andWhere('t2.deleted')->eq(0)
->andWhere('t3.deleted')->eq(0)
->beginIF($excludeStories)->andWhere('t2.id')->notIN($excludeStories)->fi()
->beginIF($this->session->storyBrowseType and strpos('changing|', $this->session->storyBrowseType) !== false)->andWhere('t2.status')->in(array_keys($unclosedStatus))->fi()
->beginIF($this->session->storyBrowseType and strpos('changing|', $this->session->storyBrowseType) !== false)->andWhere('t2.status')->in($this->storyTao->getUnclosedStatusKeys())->fi()
->beginIF($modules)->andWhere('t2.module')->in($modules)->fi();
/* 根据传入的 ID 是项目还是执行分别查询需求。 */
@@ -5222,7 +5221,7 @@ class storyModel extends model
$excludeStories = $this->storyTao->getSubdividedStoriesByProduct($productID);
if($projectID)
{
$stories = $this->getExecutionStories($projectID, $productID, $branch, '`order`_desc', 'all', 0, 'story', $excludeStories, $this->config->URAndSR ? null : $pager);
$stories = $this->getExecutionStories($projectID, $productID, '`order`_desc', 'all', 0, 'story', $excludeStories, $this->config->URAndSR ? null : $pager);
}
else
{
@@ -5279,7 +5278,7 @@ class storyModel extends model
/* 获取关联项目的研发需求。*/
$projectStories = array();
if($projectID) $projectStories = $this->getExecutionStories($projectID, $productID, $branch, '`order`_desc', 'all', 0, 'story');
if($projectID) $projectStories = $this->getExecutionStories($projectID, $productID, '`order`_desc', 'all', 0, 'story');
/* 获取用户需求细分的研发需求。 */
$requirementStories = $this->storyTao->batchGetRelations(array_keys($requirements), 'requirement', array('id', 'title', 'parent'));