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

* Finish task #116687.

Browse Source
This commit is contained in:
sunguangming
2024-04-22 10:56:00 +08:00
parent 540da8a879
commit ced28af568
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/control.php
+1 -2
View File
@@ -1502,8 +1502,7 @@ class story extends control
return $this->send($storyList);
}
$items = array();
foreach($stories as $storyID => $storyName) $items[] = array('text' => $storyName, 'value' => $storyID, 'keys' => $storyName);
$items = $this->story->addGradeLabel($stories);
return print(json_encode($items));
}
module/testcase/control.php
+4 -1
View File
@@ -564,9 +564,12 @@ class testcase extends control
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
$stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
$stories = $this->story->addGradeLabel($stories);
/* 展示变量. */
/* Show the variables. */
$this->view->stories = $this->loadModel('story')->getProductStoryPairs($productID, $branch);
$this->view->stories = $stories;
$this->view->caseIdList = $caseIdList;
$this->view->productID = $productID;
$this->view->cases = $cases;
module/testcase/zen.php
+8 -2
View File
@@ -402,10 +402,12 @@ class testcaseZen extends testcase
if($this->app->tab != 'qa' && $this->app->tab != 'product' && $this->app->tab != 'my')
{
$projectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
if($projectID) $stories = $this->story->getExecutionStoryPairs($projectID, $productID, $branch, $modules);
if($projectID) $stories = $this->story->getExecutionStoryPairs($projectID, $productID, $branch, $modules, 'full', 'all', 'story', false);
}
if($storyID && !isset($stories[$storyID])) $stories = $this->story->formatStories(array($storyID => $story)) + $stories;
$stories = $this->story->addGradeLabel($stories);
$this->view->stories = $stories;
$this->view->currentModuleID = $currentModuleID;
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, 'case', 0, $branch === 'all' || !isset($branches[$branch]) ? '0' : $branch);
@@ -872,7 +874,7 @@ class testcaseZen extends testcase
$storyStatus = $this->loadModel('story')->getStatusList('noclosed');
if($this->app->tab == 'execution')
{
$stories = $this->loadModel('story')->getExecutionStoryPairs($case->execution, $case->product, $case->branch, $moduleIdList);
$stories = $this->loadModel('story')->getExecutionStoryPairs($case->execution, $case->product, $case->branch, $moduleIdList, 'full', 'all', 'story', false);
}
else
{
@@ -881,6 +883,8 @@ class testcaseZen extends testcase
if(!in_array($this->app->tab, array('execution', 'project')) && empty($stories)) $stories = $this->story->getProductStoryPairs($case->product, $case->branch, 0, $storyStatus, 'id_desc', 0, 'full', 'story', false);
$stories = $this->story->addGradeLabel($stories);
$this->view->stories = $stories;
}
@@ -1314,6 +1318,8 @@ class testcaseZen extends testcase
$storyPairs += $storyID ? array($storyID => $story->id . ':' . $story->title) : array();
if($storyID && empty($moduleID)) $moduleID = $story->module;
$storyPairs = $this->story->addGradeLabel($storyPairs);
$this->view->product = $product;
$this->view->branches = $branches;
$this->view->customFields = $customFields;