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

* Finish task #116701.

Browse Source
This commit is contained in:
sunguangming
2024-05-06 16:13:58 +08:00
parent 88f89fd996
commit 6dec3c5943
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/ui/story.html.php
+1 -1
View File
@@ -399,7 +399,7 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
foreach($stories as $story)
{
$story->moduleID = $story->module;
$data[] = $this->story->formatStoryForList($story, $options, $storyType);
$data[] = $this->story->formatStoryForList($story, $options, $storyType, $maxGradeGroup);
}
jsVar('cases', $storyCases);
module/execution/zen.php
+17 -16
View File
@@ -270,22 +270,23 @@ class executionZen extends execution
foreach($gradeList as $grade) $gradeGroup[$grade->type][$grade->grade] = $grade->name;
/* Assign. */
$this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->story;
$this->view->storyType = $storyType;
$this->view->param = $param;
$this->view->type = $this->session->executionStoryBrowseType;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->product = $this->product->getById($productID);
$this->view->allPlans = $allPlans;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->multiBranch = $multiBranch;
$this->view->execution = $execution;
$this->view->gradeMenu = $this->loadModel('story')->getGradeMenu($storyType, $project);
$this->view->gradeGroup = $gradeGroup;
$this->view->showGrades = isset($this->config->execution->showGrades) ? $this->config->execution->showGrades : $this->story->getDefaultShowGrades($this->view->gradeMenu);
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->branchPairs = $this->loadModel('branch')->getPairs($productID, 'withClosed');
$this->view->title = $execution->name . $this->lang->colon . $this->lang->execution->story;
$this->view->storyType = $storyType;
$this->view->param = $param;
$this->view->type = $this->session->executionStoryBrowseType;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->product = $this->product->getById($productID);
$this->view->allPlans = $allPlans;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->multiBranch = $multiBranch;
$this->view->execution = $execution;
$this->view->gradeMenu = $this->loadModel('story')->getGradeMenu($storyType, $project);
$this->view->maxGradeGroup = $this->story->getMaxGradeGroup();
$this->view->gradeGroup = $gradeGroup;
$this->view->showGrades = isset($this->config->execution->showGrades) ? $this->config->execution->showGrades : $this->story->getDefaultShowGrades($this->view->gradeMenu);
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->branchPairs = $this->loadModel('branch')->getPairs($productID, 'withClosed');
}
/**
module/task/control.php
+2 -2
View File
@@ -1210,7 +1210,7 @@ class task extends control
*/
public function ajaxGetTestStories(int $executionID, int $taskID = 0)
{
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'ignoreID', 'active');
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'ignoreID', 'active', '', false);
$testStoryIdList = $this->story->getTestStories(array_keys($stories), $executionID);
$testStories = array();
foreach($stories as $testStoryID => $storyTitle)
@@ -1242,7 +1242,7 @@ class task extends control
*/
public function ajaxGetStories(int $executionID, int $moduleID, string $zeroTaskStory = 'false')
{
$stories = $this->loadModel('story')->getExecutionStoryPairs($executionID, 0, 'all', $moduleID, 'short', 'active');
$stories = $this->loadModel('story')->getExecutionStoryPairs($executionID, 0, 'all', $moduleID, 'short', 'active', '', false);
$taskCountList = $this->task->getStoryTaskCounts(array_keys($stories), $executionID);
$items = array();
module/task/zen.php
+3 -3
View File
@@ -128,7 +128,7 @@ class taskZen extends task
*/
protected function assignStoryForCreate(int $executionID, int $moduleID): void
{
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $moduleID, 'full', 'active');
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $moduleID, 'full', 'active', '', false);
$testStoryIdList = $this->loadModel('story')->getTestStories(array_keys($stories), $executionID);
$testStories = array();
foreach($stories as $testStoryID => $storyTitle)
@@ -280,7 +280,7 @@ class taskZen extends task
}
$this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name;
$this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active');
$this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active', '', false);
$this->view->tasks = $tasks;
$this->view->taskMembers = $taskMembers;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$task->openedBy},{$task->canceledBy},{$task->closedBy}");
@@ -350,7 +350,7 @@ class taskZen extends task
$showAllModule = !empty($this->config->execution->task->allModule) ? 'allModule' : '';
$modules = $this->loadModel('tree')->getTaskOptionMenu($execution->id, 0, $showAllModule);
$story = $this->story->getByID($storyID);
$stories = $this->story->getExecutionStoryPairs($execution->id, 0, 'all', $story ? $story->module : 0, 'short', 'active');
$stories = $this->story->getExecutionStoryPairs($execution->id, 0, 'all', $story ? $story->module : 0, 'short', 'active', '', false);
list($customFields, $checkedFields) = $this->getCustomFields($execution, 'batchCreate');