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

* Finish task#54980.

Browse Source
This commit is contained in:
leiyong
2022-05-26 03:24:37 +00:00
parent 414dfc75c7
commit 6c1d71c837
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/testcase/control.php
View File

@@ -453,7 +453,7 @@ class testcase extends control
if(empty($moduleID)) $moduleID = $story->module;
}
$currentModuleID = $moduleID ? (int)$moduleID : (int)$this->cookie->lastCaseModule;
$currentModuleID = $moduleID ? (int)$moduleID : (int)$this->cookie->lastCaseModule;
/* Get the status of stories are not closed. */
$storyStatus = $this->lang->story->statusList;
unset($storyStatus['closed']);
@@ -465,8 +465,9 @@ class testcase extends control
$modules = $this->loadModel('tree')->getStoryModule($storyModuleID);
$modules = $this->tree->getAllChildID($modules);
}
$stories = $this->story->getProductStoryPairs($productID, $branch, $modules, array_keys($storyStatus), 'id_desc', 50, 'null', 'story', false);
if($this->app->tab != 'qa')
if($this->app->tab != 'qa' and $this->app->tab != 'product')
{
$projectID = $this->app->tab == 'project' ? $this->session->project : $this->session->execution;
$stories = $this->story->getExecutionStoryPairs($projectID, $productID, $branch, $modules);
@@ -477,7 +478,6 @@ class testcase extends control
/* Set custom. */
foreach(explode(',', $this->config->testcase->customCreateFields) as $field) $customFields[$field] = $this->lang->testcase->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->testcase->custom->createFields;

2
module/testcase/view/create.html.php
View File

@@ -17,7 +17,7 @@
<?php js::set('lblBefore', $lang->testcase->insertBefore);?>
<?php js::set('lblAfter', $lang->testcase->insertAfter);?>
<?php js::set('isonlybody', isonlybody());?>
<?php js::set('executionID', $projectID);?>
<?php js::set('executionID', $executionID);?>
<?php js::set('tab', $this->app->tab);?>
<?php if($this->app->tab == 'execution') js::set('objectID', $executionID);?>
<?php if($this->app->tab == 'project') js::set('objectID', $projectID);?>