* Fix bug #37602.
This commit is contained in:
@@ -24,23 +24,49 @@ $('#mainContent').on('click', '.db-management', function()
|
||||
);
|
||||
});
|
||||
|
||||
var reloadTimes = 0;
|
||||
var refreshTime = 0;
|
||||
var timer = null;
|
||||
var currentStatus = instanceStatus;
|
||||
const postData = new FormData();
|
||||
postData.append('idList[]', instanceID);
|
||||
window.afterPageUpdate = function()
|
||||
{
|
||||
if(reloadTimes > 100 || instanceType != 'store') return;
|
||||
if($('#statusTD').data('reload') !== true && $('#memoryRate').data('load') !== true) return;
|
||||
// $('.db-management').addClass('disabled');
|
||||
setTimeout(function()
|
||||
{
|
||||
reloadTimes++;
|
||||
loadPage
|
||||
({
|
||||
url: $.createLink('instance', 'view', 'id=' + instanceID),
|
||||
selector: '#instanceInfoContainer',
|
||||
id: 'instanceInfoContainer',
|
||||
target: '#instanceInfoContainer',
|
||||
});
|
||||
}, 4000);
|
||||
refreshStatus();
|
||||
}
|
||||
|
||||
function refreshStatus()
|
||||
{
|
||||
if(new Date().getTime() - refreshTime < 4000) return;
|
||||
refreshTime = new Date().getTime();
|
||||
|
||||
$.ajaxSubmit({
|
||||
url: $.createLink('instance', 'ajaxStatus'),
|
||||
method: 'POST',
|
||||
data:postData,
|
||||
onComplete: function(res)
|
||||
{
|
||||
if(res.result === 'success')
|
||||
{
|
||||
$.each(res.data, function(index, instance)
|
||||
{
|
||||
if(currentStatus != instance.status)
|
||||
{
|
||||
loadCurrentPage();
|
||||
currentStatus = instance.status;
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
timer = setTimeout(() => {refreshStatus()}, 5000);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
window.onPageUnmount = function()
|
||||
{
|
||||
if(!timer) return;
|
||||
clearTimeout(timer);
|
||||
}
|
||||
|
||||
$('.copy-btn').on('click', function()
|
||||
|
||||
@@ -13,9 +13,10 @@ declare(strict_types=1);
|
||||
|
||||
namespace zin;
|
||||
|
||||
jsVar('copied', $lang->instance->copied);
|
||||
jsVar('instanceID', $instance->id);
|
||||
jsVar('instanceType', $type);
|
||||
jsVar('copied', $lang->instance->copied);
|
||||
jsVar('instanceID', $instance->id);
|
||||
jsVar('instanceStatus', $instance->status);
|
||||
jsVar('instanceType', $type);
|
||||
|
||||
$instance->appName = strtolower($instance->appName);
|
||||
$cpuInfo = $this->instance->printCpuUsage($instance, $instanceMetric->cpu, 'array');
|
||||
|
||||
@@ -41,6 +41,7 @@ class instanceZen extends instance
|
||||
$pipeline->token = zget($tempMappings, 'api_token', '');
|
||||
$pipeline->account = zget($tempMappings, 'z_username', '');
|
||||
$pipeline->password = zget($tempMappings, 'z_password', '');
|
||||
if($instance->appID === 60) $pipeline->token = base64_encode($pipeline->token . ':');
|
||||
if(empty($pipeline->account)) $pipeline->account = zget($tempMappings, 'admin_username', '');
|
||||
|
||||
$this->pipeline->create($pipeline);
|
||||
|
||||
Reference in New Issue
Block a user