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
2018-09-19 16:47:47 +08:00
parent 232eb30f5c 40d662e996
commit 576752be69
194 changed files with 268 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/css/cases.css
+3
View File
@@ -9,3 +9,6 @@ tbody > tr > td .icon-bug {margin-left: -8px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single{height:28px;padding:3px 6px}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single span{font-size:12px;}
.table-footer .table-actions .input-group #assignedTo_chosen .chosen-single div{line-height:10px;}
.fail .result-fail, .blocked .result-blocked{color:#f00;}
.pass .result-pass{color:green;}
module/testtask/model.php
+3 -3
View File
@@ -1249,7 +1249,8 @@ class testtaskModel extends model
break;
case 'lastRunResult':
$lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
echo html::a(helper::createLink('testtask', 'results', "id={$run->id}", '', true), "<i class='icon icon-list-alt'></i> <span>{$lastRunResultText}</span>", '', "class='iframe btn btn-icon-left'");
$class = 'result-' . $run->lastRunResult;
echo "<span class='$class'>" . $lastRunResultText . "</span>";
break;
case 'story':
if($run->story and $run->storyTitle) echo html::a(helper::createLink('story', 'view', "storyID=$run->story"), $run->storyTitle);
@@ -1268,10 +1269,9 @@ class testtaskModel extends model
echo $run->stepNumber;
break;
case 'actions':
echo "<div class='more'>";
common::printIcon('testcase', 'createBug', "product=$run->product&branch=$run->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$task->id", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
echo "</div>";
common::printIcon('testtask', 'results', "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
common::printIcon('testtask', 'runCase', "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
if(common::hasPriv('testtask', 'unlinkCase', $run))
module/testtask/view/activate.html.php
+1 -1
View File
@@ -28,7 +28,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/testtask/view/batchrun.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
</td>
</tr>
<?php endforeach;?>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?></td></tr>
<tr><td colspan='6' class='text-center'><?php echo html::submitButton();?></td></tr>
</table>
</form>
</div>
module/testtask/view/block.html.php
+1 -1
View File
@@ -29,7 +29,7 @@
<td><?php echo html::textarea('comment', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?></td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?></td>
</tr>
</table>
</form>
module/testtask/view/browse.html.php
-1
View File
@@ -93,7 +93,6 @@ $status = $this->session->testTaskVersionStatus;
<td><?php echo $task->end?></td>
<td title='<?php echo $lang->testtask->statusList[$task->status];?>'>
<span class='status-<?php echo $task->status?>'>
<span class='label label-dot'></span>
<span class='status-text'><?php echo $lang->testtask->statusList[$task->status];?></span>
</span>
</td>
module/testtask/view/cases.html.php
+1 -1
View File
@@ -45,7 +45,7 @@
if(!$useDatatable) include '../../common/view/tablesorter.html.php';
$config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField;
$config->testcase->datatable->fieldList['actions']['width'] = '90';
$config->testcase->datatable->fieldList['actions']['width'] = '140';
$setting = $this->datatable->getSetting('testtask');
$widths = $this->datatable->setFixedFieldWidth($setting);
module/testtask/view/close.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
</td>
</tr>
<tr>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
<td colspan='2' class='text-center form-actions'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?></td>
</tr>
</table>
</form>
module/testtask/view/create.html.php
+1 -1
View File
@@ -88,7 +88,7 @@
</tr>
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/testtask/view/edit.html.php
+1 -1
View File
@@ -81,7 +81,7 @@
</tr>
<tr>
<td class='text-center form-actions' colspan='3'>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::backButton('', '', 'btn btn-wide');?>
</td>
</tr>
module/testtask/view/runcase.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<td colspan='5' class='form-actions'>
<?php
if($preCase) echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn btn-wide'");
echo html::submitButton('', '', 'btn btn-wide btn-primary');
echo html::submitButton();
if($nextCase) echo '&nbsp;' . html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn btn-wide'");
echo html::hidden('case', $run->case->id);
echo html::hidden('version', $run->case->currentVersion);
module/testtask/view/start.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
</tr>
<tr>
<td colspan="2" class="text-center form-actions">
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>
<?php echo html::submitButton();?>
<?php echo html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide');?>
</td>
</tr>