+ finish task#576
This commit is contained in:
@@ -347,6 +347,13 @@ class bug extends control
|
||||
if($runID > 0) $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 > 0 && $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 bugID setted, use this bug as template. */
|
||||
if(isset($bugID))
|
||||
{
|
||||
|
||||
@@ -353,16 +353,21 @@ class bugModel extends model
|
||||
* Get bug info from a result.
|
||||
*
|
||||
* @param int $resultID
|
||||
* @param int $caseID
|
||||
* @param int $version
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getBugInfoFromResult($resultID)
|
||||
public function getBugInfoFromResult($resultID, $caseID = 0, $version = 0)
|
||||
{
|
||||
$title = '';
|
||||
$bugSteps = '';
|
||||
|
||||
$result = $this->dao->findById($resultID)->from(TABLE_TESTRESULT)->fetch();
|
||||
$run = $this->loadModel('testtask')->getRunById($result->run);
|
||||
if($caseID > 0)
|
||||
$run->case = $this->loadModel('testcase')->getById($caseID, $version);
|
||||
else
|
||||
$run = $this->loadModel('testtask')->getRunById($result->run);
|
||||
if($result and $result->caseResult == 'fail')
|
||||
{
|
||||
$title = $run->case->title;
|
||||
|
||||
Reference in New Issue
Block a user