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

Merge branch 'sprint/176_songchenxuan_45543' into 'master'

Browse Source 
*Finish task #45543.

See merge request easycorp/zentaopms!909
This commit is contained in:
朱金勇
2021-12-13 05:10:02 +00:00
parent 58fb407b19 8a0881aef4
commit ea39b28199
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/testcase.html.php
+1 -1
View File
@@ -64,7 +64,7 @@
common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project);
common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project);
common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project);
common::printIcon('testcase', 'edit', "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
common::printIcon('testcase', 'edit', "caseID=$caseID&comment=false&executionID=$executionID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
}
?>
</td>
module/testcase/control.php
+15 -6
View File
@@ -756,10 +756,12 @@ class testcase extends control
* Edit a case.
*
* @param int $caseID
* @param bool $comment
* @param int $executionID
* @access public
* @return void
*/
public function edit($caseID, $comment = false)
public function edit($caseID, $comment = false, $executionID = 0)
{
$this->loadModel('story');
@@ -834,10 +836,17 @@ class testcase extends control
$position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
/* Set menu. */
if($this->app->tab == 'project' or $this->app->tab == 'execution') $this->loadModel('execution');
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($case->project);
if($this->app->tab == 'execution') $this->execution->setMenu($case->execution);
if($this->app->tab == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
if($this->app->tab == 'project' or $this->app->tab == 'execution')
{
$this->loadModel('execution');
if($this->app->tab == 'project') $this->loadModel('project')->setMenu($case->project);
if($this->app->tab == 'execution')
{
if(!$executionID) $executionID = $case->execution;
$this->execution->setMenu($executionID);
}
}
if($this->app->tab == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
if($case->lib and $case->fromCaseID)
@@ -855,7 +864,7 @@ class testcase extends control
$product = $this->product->getById($productID);
if($this->app->tab == 'execution' or $this->app->tab == 'project')
{
$objectID = $this->app->tab == 'project' ? $case->project : $case->execution;
$objectID = $this->app->tab == 'project' ? $case->project : $executionID;
$productBranches = (isset($product->type) and $product->type != 'normal') ? $this->execution->getBranchByProduct($productID, $objectID, 'all') : array();
$branches = isset($productBranches[$productID]) ? $productBranches[$productID] : array();
}