diff --git a/module/convert/view/checkredmine.html.php b/module/convert/view/checkredmine.html.php index 9b278decdd..ac0a878fab 100644 --- a/module/convert/view/checkredmine.html.php +++ b/module/convert/view/checkredmine.html.php @@ -1,5 +1,5 @@ - convert->checkDB;?> + convert->checkDB;?> convert->ok) : printf($lang->convert->fail);?> @@ -7,9 +7,12 @@ convert->ok) : printf($lang->convert->fail);?> - - - +
convert->setParam; ?>
+
+
+ convert->setParam; ?> +
+ diff --git a/module/testtask/css/batchrun.css b/module/testtask/css/batchrun.css index 5b651342ed..bb517d2c53 100644 --- a/module/testtask/css/batchrun.css +++ b/module/testtask/css/batchrun.css @@ -1,3 +1,4 @@ .table-bordered {border: none} .table-bordered thead th {border-top: none} .table-form > tbody > tr > th, .table-form > tbody > tr > td {border-bottom: 1px solid #ddd} +.outer .table.table-form tbody > tr:last-child td{border:1px solid #ddd;} diff --git a/module/testtask/js/batchrun.js b/module/testtask/js/batchrun.js new file mode 100644 index 0000000000..4554de1f19 --- /dev/null +++ b/module/testtask/js/batchrun.js @@ -0,0 +1,12 @@ +$(document).on('keyup', 'form input:text', function() +{ + var preSelect = $(this).parent().prev().find('select'); + if($(this).val() == '' && $(preSelect).val() == 'fail') + { + $(preSelect).val('pass'); + } + else if($(this).val() != '' && $(preSelect).val() == 'pass') + { + $(preSelect).val('fail'); + } +}) diff --git a/module/testtask/js/runcase.js b/module/testtask/js/runcase.js new file mode 100644 index 0000000000..005a6c3bee --- /dev/null +++ b/module/testtask/js/runcase.js @@ -0,0 +1,12 @@ +$(document).on('keyup', 'form textarea', function() +{ + var preSelect = $(this).parent().prev().find('select'); + if($(this).val() == '' && $(preSelect).val() == 'fail') + { + $(preSelect).val('pass'); + } + else if($(this).val() != '' && $(preSelect).val() == 'pass') + { + $(preSelect).val('fail'); + } +}) diff --git a/module/testtask/model.php b/module/testtask/model.php index 41f5254108..dc85ba67ad 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -303,17 +303,14 @@ class testtaskModel extends model * * */ $caseResult = $this->post->result ? $this->post->result : 'pass'; - if(isset($_POST['passall']) and $this->post->passall == false) + if($this->post->steps) { - if($this->post->steps) + foreach($this->post->steps as $stepID => $stepResult) { - foreach($this->post->steps as $stepID => $stepResult) + if($stepResult != 'pass' and $stepResult != 'n/a') { - if($stepResult != 'pass' and $stepResult != 'n/a') - { - $caseResult = $stepResult; - break; - } + $caseResult = $stepResult; + break; } } } @@ -323,7 +320,7 @@ class testtaskModel extends model { foreach($this->post->steps as $stepID =>$stepResult) { - $step['result'] = $this->post->passall ? 'pass' : $stepResult; + $step['result'] = $stepResult; $step['real'] = $this->post->reals[$stepID]; $stepResults[$stepID] = $step; } @@ -341,7 +338,7 @@ class testtaskModel extends model ->setForce('stepResults', serialize($stepResults)) ->add('lastRunner', $this->app->user->account) ->add('date', $now) - ->remove('steps,reals,passall,result') + ->remove('steps,reals,result') ->get(); $this->dao->insert(TABLE_TESTRESULT)->data($result)->autoCheck()->exec(); $this->dao->update(TABLE_CASE)->set('lastRunner')->eq($this->app->user->account)->set('lastRunDate')->eq($now)->set('lastRunResult')->eq($caseResult)->where('id')->eq($this->post->case)->exec(); diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php index 5d19e75e79..72da8e169a 100644 --- a/module/testtask/view/batchrun.html.php +++ b/module/testtask/view/batchrun.html.php @@ -41,7 +41,7 @@
@@ -136,6 +139,7 @@
+
lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'")?> - +
$step):?> diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 8297ae5399..175cd8344f 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -105,9 +105,9 @@ var moduleID = ''; { $actionLink = inLink('batchAssign', "taskID=$task->id"); echo "
"; - echo html::select('assignedTo', $users, '', 'class="form-control"'); - echo ""; - echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\" style='border-left:none'"); + echo html::select('assignedTo', $users, '', 'class="form-control chosen"'); + echo ""; + echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->testtask->assign); echo '
'; } if($canBatchRun) diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 6e1640f14a..1c207d67e4 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -25,7 +25,7 @@ - + @@ -35,11 +35,11 @@ - + - + diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index aec582503f..155396a7f2 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -25,11 +25,11 @@
testtask->product;?>
testtask->project;?>
testtask->build;?>
testtask->owner;?>
- + - + diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 68cc21635d..790624a015 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -72,8 +72,8 @@ - +
testtask->project;?>project, "class='form-control'");?>project, "class='form-control chosen'");?>
testtask->build;?>build, "class='form-control'");?>build, "class='form-control chosen'");?>
testtask->owner;?>openedBy];?> testcase->statusList[$case->status];?>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php index 4bde4d43dc..44a205bbaa 100644 --- a/module/testtask/view/runcase.html.php +++ b/module/testtask/view/runcase.html.php @@ -46,7 +46,7 @@
testtask->pre, inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}")); + if($preCase) echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn'"); if(empty($run->case->steps)) { echo html::submitButton($lang->testtask->pass, "onclick=$('#result').val('pass')", 'btn-success'); @@ -55,10 +55,8 @@ else { echo html::submitButton(); - echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)"); } - if($nextCase) echo html::linkButton($lang->testtask->next, inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}")); - if($run->case->steps) echo html::hidden('passall', 0); + if($nextCase) echo html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn'"); if(!$run->case->steps) echo html::hidden('result', ''); echo html::hidden('case', $run->case->id); echo html::hidden('version', $run->case->currentVersion);