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

* Finish task #93579.

Browse Source
This commit is contained in:
songchenxuan
2023-05-23 15:14:33 +08:00
parent 2c6004013e
commit c55fb5c2be
3 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+1 -9
View File
@@ -2669,15 +2669,7 @@ class story extends control
$moduleID = $this->tree->getAllChildID($moduleID);
}
$storyStatus = '';
if($status == 'noclosed')
{
$storyStatus = $this->lang->story->statusList;
unset($storyStatus['closed']);
$storyStatus = array_keys($storyStatus);
}
if($status == 'active') $storyStatus = $status;
$storyStatus = $this->story->getStatusList($status);
if($executionID)
{
module/story/model.php
+22
View File
@@ -6552,4 +6552,26 @@ class storyModel extends model
}
}
}
/**
* Get product stroies by status.
*
* @param string $status noclosed || active
* @access public
* @return array || string
*/
public function getStatusList($status)
{
$storyStatus = '';
if($status == 'noclosed')
{
$storyStatus = $this->lang->story->statusList;
unset($storyStatus['closed']);
$storyStatus = array_keys($storyStatus);
}
if($status == 'active') $storyStatus = $status;
return $storyStatus;
}
}
module/testcase/control.php
+14 -1
View File
@@ -604,6 +604,13 @@ class testcase extends control
$projectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
$stories = $this->story->getExecutionStoryPairs($projectID, $productID, $branch, $modules);
}
/* Logic of task 44139. */
if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories))
{
$storyStatus = $this->story->getStatusList('noclosed');
$stories = $this->story->getProductStoryPairs($productID, $branch, 0, $storyStatus, 'id_desc', 0, 'full', 'story', 1);
}
if($storyID and !isset($stories[$storyID])) $stories = $this->story->formatStories(array($storyID => $story)) + $stories;//Fix bug #2406.
$productInfo = $this->loadModel('product')->getById($productID);
@@ -1061,6 +1068,12 @@ class testcase extends control
{
$stories = $this->story->getProductStoryPairs($productID, $case->branch, $moduleIdList, 'all','id_desc', 0, 'full', 'story', false);
}
/* Logic of task 44139. */
if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories))
{
$storyStatus = $this->story->getStatusList('noclosed');
$stories = $this->story->getProductStoryPairs($case->product, $case->branch, 0, $storyStatus, 'id_desc', 0, 'full', 'story', 1);
}
$this->view->productID = $productID;
$this->view->product = $product;
@@ -2496,7 +2509,7 @@ class testcase extends control
// if(!empty($_POST['syncToZentao']))
// $this->zanode->syncCasesToZentao($_POST['scriptPath']);
// $nodeID = $_POST['node'];
// $node = $this->zanode->getNodeByID($_POST['node']);