diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index c3d255bd9f..7ab9ea9417 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -253,12 +253,6 @@ processStatus('testcase', $case); - if($case->version > $case->currentVersion and $from == 'testtask') - { - echo "(testcase->fromTesttask}>{$lang->testcase->changed} "; - if(common::hasPriv('testcase', 'confirmchange')) echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id&taskID=$taskID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'"); - echo ")"; - } if(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and $from != 'testtask' and !empty($case->product)) { echo "(testcase->fromCaselib}>{$lang->testcase->changed} "; diff --git a/module/testtask/model.php b/module/testtask/model.php index c519f15aff..39d9b0e915 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -977,7 +977,7 @@ class testtaskModel extends model $fieldToSort = substr($orderBy, 0, strpos($orderBy, '_')); $orderBy = strpos($specialFields, ',' . $fieldToSort . ',') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy); - return $this->dao->select('t2.*,t1.*,t2.version as caseVersion,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t2.*,t1.*,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') ->where('t1.task')->eq((int)$taskID) @@ -1007,7 +1007,7 @@ class testtaskModel extends model $cases = $this->loadModel('testsuite')->getLinkedCasePairs($suiteID); - return $this->dao->select('t2.*,t1.*,t2.version as caseVersion,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t2.*,t1.*,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') ->where('t1.task')->eq((int)$taskID) @@ -1034,7 +1034,7 @@ class testtaskModel extends model $fieldToSort = substr($orderBy, 0, strpos($orderBy, '_')); $orderBy = strpos($specialFields, ',' . $fieldToSort . ',') !== false ? ('t1.' . $orderBy) : ('t2.' . $orderBy); - return $this->dao->select('t2.*,t1.*,t2.version as caseVersion,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') + return $this->dao->select('t2.*,t1.*,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') ->where('t1.task')->eq((int)$taskID) @@ -1110,7 +1110,7 @@ class testtaskModel extends model $fieldToSort = substr($sort, 0, strpos($sort, '_')); $orderBy = strpos($specialFields, ',' . $fieldToSort . ',') !== false ? ('t1.' . $sort) : ('t2.' . $sort); - $runs = $this->dao->select('t2.*,t1.*, t2.version as caseVersion,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') + $runs = $this->dao->select('t2.*,t1.*,t3.title as storyTitle,t2.status as caseStatus')->from(TABLE_TESTRUN)->alias('t1') ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id') ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.story = t3.id') ->where($caseQuery) @@ -1582,7 +1582,7 @@ class testtaskModel extends model if($action == 'runcase') { - if(isset($testtask->caseStatus)) return $testtask->version < $testtask->caseVersion ? $testtask->caseStatus == 'wait' : $testtask->caseStatus != 'wait'; + if(isset($testtask->caseStatus)) return $testtask->caseStatus != 'wait'; return $testtask->status != 'wait'; } diff --git a/module/testtask/view/groupcase.html.php b/module/testtask/view/groupcase.html.php index 15f4b60f89..036a944250 100644 --- a/module/testtask/view/groupcase.html.php +++ b/module/testtask/view/groupcase.html.php @@ -71,13 +71,13 @@ lastRunner);?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?> - version < $run->caseVersion) ? "{$lang->testcase->changed}" : $this->processStatus('testcase', $run);?> + processStatus('testcase', $run);?> bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?> results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?> stepNumber;?> - id&caseID=$run->case&version=$run->caseVersion", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?> + id&caseID=$run->case&version=$run->version", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");?> case", '', 'list');?>