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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2017-03-21 13:24:43 +08:00
parent 940d9b7b42 741a5ac94b
commit a6c7eed490
5 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+8 -9
View File
@@ -260,15 +260,14 @@ class bug extends control
$extras = str_replace(array(',', ' '), array('&', ''), $extras);
parse_str($extras);
/* If set runID, get the last result info as the template. */
if(!empty($runID)) $resultID = $this->dao->select('id')->from(TABLE_TESTRESULT)->where('run')->eq($runID)->orderBy('id desc')->limit(1)->fetch('id');
if(isset($resultID) and $resultID > 0) extract($this->bug->getBugInfoFromResult($resultID));
/* If set caseID and runID='', get the last result info as the template. */
if($caseID && empty($runID))
{
$resultID = $this->dao->select('id')->from(TABLE_TESTRESULT)->where('`case`')->eq($caseID)->orderBy('date desc')->limit(1)->fetch('id');
if(isset($resultID) and $resultID > 0) extract($this->bug->getBugInfoFromResult($resultID, $caseID, $version));
/* If set runID, get the result info by resultID as the template. Else get the result info by resultID and case info. */
if($runID)
{
extract($this->bug->getBugInfoFromResult($resultID));
}
else
{
extract($this->bug->getBugInfoFromResult($resultID, $caseID, $version));
}
/* If bugID setted, use this bug as template. */
module/testcase/css/createbug.css
+11
View File
@@ -8,3 +8,14 @@ body {padding: 15px;}
.table tfoot td {border-bottom: none}
.table-actions {float: none; padding: 10px 0 0 0;}
.table-actions .checkbox.btn {padding: 6px 11px;}
.resultSteps .step-id {text-align: right}
.resultSteps .step-item-id {background-color: transparent; border: none; display: none; width: 30px; padding-left: 0; padding-right: 0; text-align: right; padding-right: 8px}
.resultSteps .checkbox-inline input[type="checkbox"] {top: -2px}
.resultSteps .btn-group .btn {padding-left: 0; padding-right: 0; min-width: 30px;}
.resultSteps .step-actions {width: 98px;}
.resultSteps .active td {transition: background-color .5s;}
.resultSteps .step-group .step-steps {resize: none; max-height: 30px;}
.resultSteps .step-group .step-expects {display: none;}
.resultSteps .step-item .step-item-id {display: table-cell;}
.resultSteps .step-item .step-id {color: transparent}
module/testcase/view/createbug.html.php
-1
View File
@@ -11,7 +11,6 @@
*/
?>
<?php include '../../common/view/header.lite.html.php';?>
<form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,runID=")?>' target='_parent' method='post'>
<div class='main' id='resultsContainer'>
</div>
</form>
module/testtask/control.php
+1
View File
@@ -888,6 +888,7 @@ class testtask extends control
}
$this->view->case = $case;
$this->view->runID = $runID;
$this->view->results = $results;
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($case->product, $branch = 0, $params = '');
$this->view->users = $this->loadModel('user')->getPairs('noclosed, noletter');
module/testtask/view/results.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
</tr>
<tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
<td colspan='7' class='pd-0'>
<form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,runID=")?>' target='_blank' method='post'>
<form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID")?>' target='_blank' method='post'>
<table class='table table-condensed borderless mg-0 resultSteps'>
<thead>
<tr>