Merge branch 'feature/42500' into zenops_66
This commit is contained in:
@@ -2400,6 +2400,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']);
|
||||
|
||||
|
||||
@@ -48,6 +48,10 @@
|
||||
<td>
|
||||
</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;?>
|
||||
|
||||
@@ -53,6 +53,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna
|
||||
$lang->zanode->actionSuccess = 'Success';
|
||||
$lang->zanode->deleted = "Deleted";
|
||||
$lang->zanode->scriptPath = "Script path";
|
||||
$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao";
|
||||
$lang->zanode->shell = "Shell";
|
||||
$lang->zanode->automation = "Automation";
|
||||
$lang->zanode->install = "Install";
|
||||
|
||||
@@ -53,6 +53,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna
|
||||
$lang->zanode->actionSuccess = 'Success';
|
||||
$lang->zanode->deleted = "Deleted";
|
||||
$lang->zanode->scriptPath = "Script path";
|
||||
$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao";
|
||||
$lang->zanode->shell = "Shell";
|
||||
$lang->zanode->automation = "Automation";
|
||||
$lang->zanode->install = "Install";
|
||||
|
||||
@@ -53,6 +53,7 @@ $lang->zanode->confirmRestore = "The ZenAgent Node will be restored to this sna
|
||||
$lang->zanode->actionSuccess = 'Success';
|
||||
$lang->zanode->deleted = "Deleted";
|
||||
$lang->zanode->scriptPath = "Script path";
|
||||
$lang->zanode->syncToZentao = "Sync cases in the directory to Zentao";
|
||||
$lang->zanode->shell = "Shell";
|
||||
$lang->zanode->automation = "Automation";
|
||||
$lang->zanode->install = "Install";
|
||||
|
||||
@@ -53,6 +53,7 @@ $lang->zanode->confirmRestore = "执行节点将会还原至此快照状态,
|
||||
$lang->zanode->actionSuccess = '操作成功';
|
||||
$lang->zanode->deleted = "已删除";
|
||||
$lang->zanode->scriptPath = "脚本目录";
|
||||
$lang->zanode->syncToZentao = "同步脚本信息到禅道";
|
||||
$lang->zanode->shell = "shell命令";
|
||||
$lang->zanode->automation = "自动化设置";
|
||||
$lang->zanode->install = "安装";
|
||||
|
||||
@@ -1088,6 +1088,7 @@ class zanodemodel extends model
|
||||
{
|
||||
$now = helper::now();
|
||||
$data = fixer::input('post')
|
||||
->remove('syncToZentao')
|
||||
->setDefault('createdBy', $this->app->user->account)
|
||||
->setDefault('createdDate', $now)
|
||||
->setDefault('node', 0)
|
||||
@@ -1138,4 +1139,14 @@ class zanodemodel extends model
|
||||
return dao::$errors = $this->lang->zanode->runTimeout;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sync cases in dir to zentao.
|
||||
*
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function syncCasesToZentao($path)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user