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

Merge branch 'zenops_66' into zenops_69

Browse Source
This commit is contained in:
zhaoke
2023-04-07 11:19:27 +08:00
parent 026897ad09 917d2e9815
commit 290cd3f882
67 changed files with 964 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+3
View File
@@ -2495,6 +2495,9 @@ class testcase extends control
if(dao::isError()) return print(js::error(dao::getError()));
if(!empty($_POST['syncToZentao']))
$this->zanode->syncCasesToZentao($_POST['scriptPath']);
$nodeID = $_POST['node'];
$node = $this->zanode->getNodeByID($_POST['node']);
module/testcase/css/automation.css
+1
View File
@@ -0,0 +1 @@
table a.refresh {border-color: white;}
module/testcase/js/automation.js
+8
View File
@@ -0,0 +1,8 @@
function loadNodes()
{
var nodeLink = createLink('zanode', 'ajaxGetNodes');
$('#nodeIdBox').load(nodeLink, function()
{
$('#nodeIdBox').find('#node').picker();
});
}
module/testcase/view/automation.html.php
+11 -6
View File
@@ -33,26 +33,31 @@
<?php endif;?>
<tr>
<th class='w-100px'><?php echo $lang->zanode->common;?></th>
<td class='required'><?php echo html::select('node', $nodeList, !empty($automation->node) ? $automation->node : '', "class='form-control picker-select'");?></td>
<td></td>
<td class='required' id='nodeIdBox'><?php echo html::select('node', $nodeList, !empty($automation->node) ? $automation->node : '', "class='form-control picker-select'");?></td>
<td>
<?php echo html::a($this->createLink('zanode', 'create'), $lang->zanode->create, '', "class='text-primary' target='_blank'");?>
<?php echo html::a("javascript:void(0)", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$lang->refresh}' onclick='loadNodes()'");?>
</td>
<td></td>
</tr>
<tr>
<th>
<?php echo $lang->zanode->scriptPath;?>
</th>
<td class='required'><?php echo html::input('scriptPath', !empty($automation->scriptPath) ? $automation->scriptPath : '', "class='form-control'");?></td>
<td class='required'><?php echo html::input('scriptPath', !empty($automation->scriptPath) ? $automation->scriptPath : '', "class='form-control' placeholder='{$lang->zanode->scriptTips}'");?></td>
<td>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->scriptTips;?>"></icon>
</td>
</tr>
<tr>
<th></th>
<td><?php echo html::checkbox('syncToZentao', array(1 => $lang->zanode->syncToZentao), '');?></td>
</tr>
<tr>
<th>
<?php echo $lang->zanode->shell;?>
</th>
<td colspan='2'><?php echo html::textarea('shell', !empty($automation->shell) ? $automation->shell : '', "rows='6' class='form-control'");?></td>
<td colspan='2'><?php echo html::textarea('shell', !empty($automation->shell) ? $automation->shell : '', "rows='6' class='form-control' placeholder='{$lang->zanode->shellTips}'");?></td>
<td>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->shellTips;?>"></icon>
</td>
</tr>
<tr>