diff --git a/module/install/js/progress.ui.js b/module/install/js/progress.ui.js index b776f5a327..5d9c37f5a9 100644 --- a/module/install/js/progress.ui.js +++ b/module/install/js/progress.ui.js @@ -65,8 +65,21 @@ function getInstallProgress() if(installed) { + clearInterval(logTimer); $('.progress-message').text(notices.installationSuccess); - if(!isModal) loadPage($.createLink('install', 'step6')); + if(!isModal) + { + loadPage($.createLink('install', 'step6')); + } + else + { + zui.Modal.alert(notices.installationSuccess).then(() => { + const modal = zui.Modal.query('#installProgress'); + if(modal) modal.hide(); + + loadPage($.createLink('space', 'browse')); + }) + } } } else @@ -133,5 +146,6 @@ $(function() term.open(document.getElementById('terminal')); }); - setInterval(getInstallProgress, 4000); + + logTimer = setInterval(getInstallProgress, 4000); }); diff --git a/module/solution/lang/de.php b/module/solution/lang/de.php index 01fdf33586..aae35c6870 100644 --- a/module/solution/lang/de.php +++ b/module/solution/lang/de.php @@ -58,6 +58,7 @@ $lang->solution->errors->notEnoughResource = 'Not enough resource, please inc $lang->solution->installationErrors = array(); $lang->solution->installationErrors['waiting'] = 'Installation not started.'; $lang->solution->installationErrors['installing'] = 'Installing.'; +$lang->solution->installationErrors['installed'] = 'Installed'; $lang->solution->installationErrors['uninstalling'] = 'Installation canceled.'; $lang->solution->installationErrors['cneError'] = 'Installation failed.'; $lang->solution->installationErrors['timeout'] = 'Installation timeout.'; diff --git a/module/solution/lang/en.php b/module/solution/lang/en.php index 01fdf33586..aae35c6870 100644 --- a/module/solution/lang/en.php +++ b/module/solution/lang/en.php @@ -58,6 +58,7 @@ $lang->solution->errors->notEnoughResource = 'Not enough resource, please inc $lang->solution->installationErrors = array(); $lang->solution->installationErrors['waiting'] = 'Installation not started.'; $lang->solution->installationErrors['installing'] = 'Installing.'; +$lang->solution->installationErrors['installed'] = 'Installed'; $lang->solution->installationErrors['uninstalling'] = 'Installation canceled.'; $lang->solution->installationErrors['cneError'] = 'Installation failed.'; $lang->solution->installationErrors['timeout'] = 'Installation timeout.'; diff --git a/module/solution/lang/fr.php b/module/solution/lang/fr.php index 01fdf33586..aae35c6870 100644 --- a/module/solution/lang/fr.php +++ b/module/solution/lang/fr.php @@ -58,6 +58,7 @@ $lang->solution->errors->notEnoughResource = 'Not enough resource, please inc $lang->solution->installationErrors = array(); $lang->solution->installationErrors['waiting'] = 'Installation not started.'; $lang->solution->installationErrors['installing'] = 'Installing.'; +$lang->solution->installationErrors['installed'] = 'Installed'; $lang->solution->installationErrors['uninstalling'] = 'Installation canceled.'; $lang->solution->installationErrors['cneError'] = 'Installation failed.'; $lang->solution->installationErrors['timeout'] = 'Installation timeout.'; diff --git a/module/solution/lang/zh-cn.php b/module/solution/lang/zh-cn.php index b869190323..fe14578a85 100644 --- a/module/solution/lang/zh-cn.php +++ b/module/solution/lang/zh-cn.php @@ -58,6 +58,7 @@ $lang->solution->errors->notEnoughResource = '资源不足, 请增加配置 $lang->solution->installationErrors = array(); $lang->solution->installationErrors['waiting'] = '安装未开始。'; $lang->solution->installationErrors['installing'] = '正在安装中。'; +$lang->solution->installationErrors['installed'] = '安装已完成。'; $lang->solution->installationErrors['uninstalling'] = '安装已取消。'; $lang->solution->installationErrors['cneError'] = '安装失败。'; $lang->solution->installationErrors['timeout'] = '安装超时。'; diff --git a/module/space/ui/browse.html.php b/module/space/ui/browse.html.php index 0c8caf3950..7300a10906 100644 --- a/module/space/ui/browse.html.php +++ b/module/space/ui/browse.html.php @@ -37,6 +37,7 @@ toolBar 'url' => createLink('install', 'progress', "solutionID=$solutionID&install=true"), 'data-size' => array('width' => '900', 'height' => '500'), 'data-class-name' => 'install-progress', + 'data-id' => 'installProgress', 'data-toggle' => 'modal' ))) : null, $config->inQuickon && $canInstall ? item(set(array