From 69159b5520c1a3a7b8d0a416f735d558c2e22e7e Mon Sep 17 00:00:00 2001 From: zhaoke Date: Fri, 10 Feb 2023 07:30:45 +0000 Subject: [PATCH 1/4] * Fix bug #32037. --- module/zanode/control.php | 4 +++- module/zanode/lang/de.php | 5 +++-- module/zanode/lang/en.php | 5 +++-- module/zanode/lang/fr.php | 5 +++-- module/zanode/lang/zh-cn.php | 5 +++-- module/zanode/model.php | 3 +++ module/zanode/view/browsesnapshot.html.php | 4 ++-- 7 files changed, 20 insertions(+), 11 deletions(-) diff --git a/module/zanode/control.php b/module/zanode/control.php index 835d3a8465..245ecbd4c9 100644 --- a/module/zanode/control.php +++ b/module/zanode/control.php @@ -469,7 +469,9 @@ class zanode extends control if(dao::isError()) { - return print(js::alert(dao::getError()) . js::reload('parent')); + $errors = dao::getError(); + if(is_array($errors)) $errors = implode($errors, ','); + return print(js::alert($errors) . js::reload('parent')); } else { diff --git a/module/zanode/lang/de.php b/module/zanode/lang/de.php index 1200f7cf54..6fb124d62c 100644 --- a/module/zanode/lang/de.php +++ b/module/zanode/lang/de.php @@ -101,8 +101,9 @@ $lang->zanode->imageNameEmpty = 'Name can not be empty.'; $lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.'; -$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; -$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; +$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['notRunning'] = 'Please check the execution node status.'; $lang->zanode->publicList[0] = 'Private'; $lang->zanode->publicList[1] = 'Public'; diff --git a/module/zanode/lang/en.php b/module/zanode/lang/en.php index 25a9e2dd6c..563d3eed23 100644 --- a/module/zanode/lang/en.php +++ b/module/zanode/lang/en.php @@ -105,8 +105,9 @@ $lang->zanode->snapRestoring = 'Snapshot is restoring.'; $lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.'; -$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; -$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; +$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['notRunning'] = 'Please check the execution node status.'; $lang->zanode->publicList[0] = 'Private'; $lang->zanode->publicList[1] = 'Public'; diff --git a/module/zanode/lang/fr.php b/module/zanode/lang/fr.php index 1200f7cf54..6fb124d62c 100644 --- a/module/zanode/lang/fr.php +++ b/module/zanode/lang/fr.php @@ -101,8 +101,9 @@ $lang->zanode->imageNameEmpty = 'Name can not be empty.'; $lang->zanode->runTimeout = 'Network connection timeout, please check the host and execution node status.'; -$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; -$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['-10100'] = 'ZenAgent Node not found.'; +$lang->zanode->apiError['fail'] = 'Connection timeout, Please check the host and execution node status.'; +$lang->zanode->apiError['notRunning'] = 'Please check the execution node status.'; $lang->zanode->publicList[0] = 'Private'; $lang->zanode->publicList[1] = 'Public'; diff --git a/module/zanode/lang/zh-cn.php b/module/zanode/lang/zh-cn.php index 27f9b1175c..220b61ae5e 100644 --- a/module/zanode/lang/zh-cn.php +++ b/module/zanode/lang/zh-cn.php @@ -106,8 +106,9 @@ $lang->zanode->snapRestoring = '快照正在还原中'; $lang->zanode->runTimeout = '自动执行失败，请检查宿主机和执行节点状态'; -$lang->zanode->apiError['-10100'] = '执行节点不存在'; -$lang->zanode->apiError['fail'] = '执行失败，请检查宿主机和执行节点状态'; +$lang->zanode->apiError['-10100'] = '执行节点不存在'; +$lang->zanode->apiError['fail'] = '执行失败，请检查宿主机和执行节点状态'; +$lang->zanode->apiError['notRunning'] = '请检查执行节点状态'; $lang->zanode->publicList[0] = '不共享'; $lang->zanode->publicList[1] = '共享'; diff --git a/module/zanode/model.php b/module/zanode/model.php index 5b7c426a5c..bd81193d76 100644 --- a/module/zanode/model.php +++ b/module/zanode/model.php @@ -187,6 +187,9 @@ class zanodemodel extends model $node = $this->getNodeByID($zanodeID); + if($node->status != 'running') dao::$errors['name'] = $this->lang->zanode->apiError['notRunning']; + if(dao::isError()) return false; + $newSnapshot = new stdClass(); $newSnapshot->host = $node->id; $newSnapshot->name = $data->name; diff --git a/module/zanode/view/browsesnapshot.html.php b/module/zanode/view/browsesnapshot.html.php index 067087af4a..055aa2fc9f 100644 --- a/module/zanode/view/browsesnapshot.html.php +++ b/module/zanode/view/browsesnapshot.html.php @@ -40,10 +40,10 @@ $editAttr = $snapshot->status == 'failed' ? 'class="btn disabled"' : "title={$lang->zanode->editSnapshot} onclick='window.parent.editSnapshot(\"" . $this->createLink('zanode', 'editSnapshot', "snapshotID={$snapshot->id}") . "\")' class='btn'"; $restoreAttr = "title='{$lang->zanode->restoreSnapshot}' target='hiddenwin'"; - $restoreAttr .= ($node->status !='running' or $snapshot->status == 'restoring' or $snapshot->status == 'failed') ? ' class="btn disabled"' : 'class="btn"'; + $restoreAttr .= ($node->status !='running' or in_array($snapshot->status, array('creating', 'failed', 'restoring'))) ? ' class="btn disabled"' : 'class="btn"'; $deleteAttr = "title='{$lang->zanode->deleteSnapshot}' target='hiddenwin'"; - $deleteAttr .= (($snapshot->status == 'restoring' and (time() - strtotime($snapshot->restoreDate)) <= 600) or $snapshot->status == 'failed') ? ' class="btn disabled"' : 'class="btn"'; + $deleteAttr .= ($snapshot->status == 'restoring' or $snapshot->status == 'creating') ? ' class="btn disabled"' : 'class="btn"'; ?> localName ? $snapshot->localName : $snapshot->name;?> zanode->snapshot->statusList, $snapshot->status, '');?> From 3acbbc90db83585ff4459344ec93d2864efdc522 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Mon, 13 Feb 2023 07:32:55 +0000 Subject: [PATCH 2/4] * Fix bug #31967. --- module/zahost/js/browseimage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/zahost/js/browseimage.js b/module/zahost/js/browseimage.js index d142876596..aa7117f964 100644 --- a/module/zahost/js/browseimage.js +++ b/module/zahost/js/browseimage.js @@ -34,6 +34,7 @@ function updateProgress() { $('.image-download-' + imageID).addClass('disabled'); $('.image-cancel-' + imageID).addClass('disabled'); $('.image-cancel-' + imageID).attr('href', '#'); + $('.image-progress-' + imageID).text("100%"); } else { From 8391cf56797d5e435ddd2a53ab0d272c367b7531 Mon Sep 17 00:00:00 2001 From: zhaoke Date: Mon, 13 Feb 2023 07:33:10 +0000 Subject: [PATCH 3/4] * Fix bug 31967. --- module/testcase/css/browse.css | 1 + module/testcase/lang/de.php | 2 +- module/testcase/lang/en.php | 2 +- module/testcase/lang/fr.php | 2 +- module/testcase/lang/zh-cn.php | 2 +- module/testcase/view/automation.html.php | 2 +- module/testcase/view/caseheader.html.php | 7 ++----- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index 3695c8e51c..9764be43be 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -30,3 +30,4 @@ tbody > tr > td .icon-share {font-size: 9px;} #mainMenu .pull-left .dividing-line {margin: 7px 5px 0 0;} .btn-toolbar>.btn, .btn-toolbar>.btn-group, .btn-toolbar>.dropdown {margin-right: 5px;} +.checkbox-primary{float: left;} diff --git a/module/testcase/lang/de.php b/module/testcase/lang/de.php index 2f5bb81309..6141fe951c 100644 --- a/module/testcase/lang/de.php +++ b/module/testcase/lang/de.php @@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait'] = 'Wartend'; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; -$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; +$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/en.php b/module/testcase/lang/en.php index 5615527217..742b76eef3 100644 --- a/module/testcase/lang/en.php +++ b/module/testcase/lang/en.php @@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait'] = 'Waiting'; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; -$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; +$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/fr.php b/module/testcase/lang/fr.php index d124bc8831..ae5af1a001 100644 --- a/module/testcase/lang/fr.php +++ b/module/testcase/lang/fr.php @@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait'] = 'En Attente'; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['group'] = 'Group View'; $lang->testcase->featureBar['browse']['zerocase'] = 'Zero Case Story'; -$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['browse']['suite'] = 'Suite'; +$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/lang/zh-cn.php b/module/testcase/lang/zh-cn.php index 956d9281f3..7eff48ce95 100644 --- a/module/testcase/lang/zh-cn.php +++ b/module/testcase/lang/zh-cn.php @@ -265,6 +265,6 @@ $lang->testcase->featureBar['browse']['wait'] = '待评审'; $lang->testcase->featureBar['browse']['needconfirm'] = $lang->testcase->needConfirm; $lang->testcase->featureBar['browse']['group'] = '分组查看'; $lang->testcase->featureBar['browse']['zerocase'] = "零用例{$lang->SRCommon}"; -$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['browse']['suite'] = '套件'; +$lang->testcase->featureBar['browse']['autocase'] = $lang->testcase->showAutoCase; $lang->testcase->featureBar['groupcase'] = $lang->testcase->featureBar['browse']; diff --git a/module/testcase/view/automation.html.php b/module/testcase/view/automation.html.php index 0bfc8d1f25..07aff412c9 100644 --- a/module/testcase/view/automation.html.php +++ b/module/testcase/view/automation.html.php @@ -18,7 +18,7 @@

- zanode->automation;?> + zanode->automation;?> 

diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php index af58afa9b1..32e9a150fb 100644 --- a/module/testcase/view/caseheader.html.php +++ b/module/testcase/view/caseheader.html.php @@ -196,13 +196,10 @@
" . $lang->testcase->automation, '', "class='btn btn-link iframe' data-width='50%'", true, true)?> - - -