proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-14 07:03:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: fix backup "Run now" with specific node selected

Browse Source 
Previous behaviour was bugged and displayed "Node is offline" for all
non-selected nodes (only 1 can be selected at a time).

Also fix progress window to show correct number of nodes in backup job.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2019-11-04 15:51:56 +01:00 committed by Thomas Lamprecht
parent 56894d029c
commit 448454ffcd
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
www/manager6/dc/Backup.js
View File

@ -432,22 +432,23 @@ Ext.define('PVE.dc.BackupView', {
job.all = job.all === true ? 1 : 0;
var errors = [];
var inProgress = allNodes.length;
var jobCount = jobNode === undefined ? allNodes.length : 1;
var inProgress = jobCount;
Ext.Msg.show({
title: gettext('Please wait...'),
closable: false,
progress: true
});
Ext.Msg.updateProgress(0, '0/' + allNodes.length);
Ext.Msg.updateProgress(0, '0/' + jobCount);
var postRequest = function () {
inProgress++;
Ext.Msg.updateProgress(inProgress/allNodes.length,
inProgress + '/' + allNodes.length);
Ext.Msg.updateProgress(inProgress/jobCount,
inProgress + '/' + jobCount);
if (inProgress == allNodes.length) {
if (inProgress == jobCount) {
Ext.Msg.hide();
if (errors !== undefined && errors.length > 0) {
Ext.Msg.alert('Error', 'Some errors have been encountered:<br />---<br />'
@ -457,8 +458,11 @@ Ext.define('PVE.dc.BackupView', {
}
allNodes.forEach(node => {
if (node.status !== 'online' ||
(jobNode !== undefined && jobNode !== node.node)) {
if (jobNode !== undefined && jobNode !== node.node) {
return;
}
if (node.status !== 'online') {
errors.push(node.node + ": " + gettext("Node is offline"));
return;
}