* Fix bug 31348.
This commit is contained in:
@@ -24,7 +24,7 @@ $('#checkServiceStatus').click(function(){
|
||||
if(resultData.data[key] == 'ready' || resultData.data[key] == 'not_available')
|
||||
{
|
||||
$('.ztf-status').text(zanodeLang.init[resultData.data[key]])
|
||||
$('.ztf-install').text(zanodeLang.reinstall);
|
||||
$('.ztf-install').text('');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -695,7 +695,7 @@ class zanodemodel extends model
|
||||
*/
|
||||
public function getServiceStatus($node)
|
||||
{
|
||||
$result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array("services" => "all")), array(), array("Authorization:$node->tokenSN")));
|
||||
$result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array("services" => "all")), array(), array("Authorization:$node->tokenSN"), 'data', 'POST', 2));
|
||||
if(empty($result->data->ztfStatus) || $result->code != 'success')
|
||||
{
|
||||
$result = new stdclass;
|
||||
|
||||
@@ -137,7 +137,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
|
||||
</span>
|
||||
</div>
|
||||
<div class="status-notice">
|
||||
<span class='init-success hide'><?php echo sprintf($lang->zanode->init->initSuccessNoticeTitle, "<a href='https://www.zentao.net/book/zentaopms/971.html'>{$lang->zanode->manual}</a>", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?></span>
|
||||
<span class='init-success hide'><?php echo sprintf($lang->zanode->init->initSuccessNoticeTitle, "<a href='https://www.zentao.net/book/zentaopms/configure-environment-974.html'>{$lang->zanode->manual}</a>", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?></span>
|
||||
<span class='init-fail hide'><?php echo $lang->zanode->init->initFailNoticeTitle . '<br/>' . $lang->zanode->init->initFailNoticeDesc;?></span>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user