* Fix bug#11695.

This commit is contained in:
leiyong
2021-03-31 11:12:25 +03:00
parent 9a010bf5ef
commit 623ce6b32f
3 changed files with 11 additions and 6 deletions
+9 -5
View File
@@ -435,11 +435,6 @@ class bug extends control
if($runID and $resultID) extract($this->bug->getBugInfoFromResult($resultID, 0, 0, isset($stepIdList) ? $stepIdList : ''));// If set runID and resultID, get the result info by resultID as template.
if(!$runID and $caseID) extract($this->bug->getBugInfoFromResult($resultID, $caseID, $version, isset($stepIdList) ? $stepIdList : ''));// If not set runID but set caseID, get the result info by resultID and case info.
if($testtask)
{
$testtask = $this->loadModel('testtask')->getById($testtask);
$buildID = $testtask->build;
}
/* If bugID setted, use this bug as template. */
if(isset($bugID))
@@ -456,7 +451,15 @@ class bug extends control
$assignedTo = $bug->assignedTo;
$deadline = $bug->deadline;
$color = $bug->color;
$testtask = $bug->testtask;
}
if($testtask)
{
$testtask = $this->loadModel('testtask')->getById($testtask);
$buildID = $testtask->build;
}
if(isset($todoID))
{
$todo = $this->loadModel('todo')->getById($todoID);
@@ -687,6 +690,7 @@ class bug extends control
if(!$bug) die(js::error($this->lang->notFound) . js::locate('back'));
if($bug->project) $this->session->project = $bug->project;
$this->view->products = $this->products = $this->product->getProductPairsByProject($this->session->project);
$this->session->set('storyList', '', 'product');
$this->bug->checkBugExecutionPriv($bug);
+1 -1
View File
@@ -317,7 +317,7 @@ js::set('blockID', $blockID);
<?php echo html::submitButton();?>
<?php if($caseID == 0) echo html::backButton();?>
<?php echo html::hidden('case', (int)$caseID) . html::hidden('caseVersion', (int)$version);?>
<?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', $testtask ? (int)$testtask : 0);?>
<?php echo html::hidden('result', (int)$runID) . html::hidden('testtask', empty($testtask) ? 0 : $testtask->id);?>
</td>
</tr>
</tfoot>
+1
View File
@@ -45,6 +45,7 @@
<tbody>
<?php foreach($stories as $key => $story):?>
<?php
$param = 0;
if($this->app->openApp == 'project') $param = $this->session->project;
if($this->app->openApp == 'execution') $param = $this->session->execution;
$viewLink = $this->createLink('story', 'view', "storyID=$story->id&version=0&param=$param");