diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 68edc275..f681d01d 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -545,6 +545,14 @@ Ext.define('PVE.Utils', { utilities: { 'snippets': gettext('Snippets') }, + volume_is_qemu_backup: function(volid, format) { + return format === 'pbs-vm' || volid.match(':backup/vzdump-qemu-'); + }, + + volume_is_lxc_backup: function(volid, format) { + return format === 'pbs-ct' || volid.match(':backup/vzdump-(lxc|openvz)-'); + }, + storageSchema: { dir: { name: Proxmox.Utils.directoryText, @@ -661,7 +669,7 @@ Ext.define('PVE.Utils', { utilities: { Ext.String.leftPad(data.channel,2, '0') + " ID " + data.id + " LUN " + data.lun; } - return data.volid.replace(/^.*:(.*\/)?/,''); + return data.volid.replace(/^.*?:(.*?\/)?/,''); }, render_serverity: function (value) { @@ -1337,4 +1345,3 @@ Ext.define('PVE.Utils', { utilities: { } }); - diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index 5e73f902..968b1d48 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -27,17 +27,13 @@ Ext.define('PVE.grid.BackupView', { } var vmtypeFilter; - if (vmtype === 'openvz') { + if (vmtype === 'lxc' || vmtype === 'openvz') { vmtypeFilter = function(item) { - return item.data.volid.match(':backup/vzdump-openvz-'); - }; - } else if (vmtype === 'lxc') { - vmtypeFilter = function(item) { - return item.data.volid.match(':backup/vzdump-lxc-'); + return PVE.Utils.volume_is_lxc_backup(item.data.volid, item.data.format); }; } else if (vmtype === 'qemu') { vmtypeFilter = function(item) { - return item.data.volid.match(':backup/vzdump-qemu-'); + return PVE.Utils.volume_is_qemu_backup(item.data.volid, item.data.format); }; } else { throw "unsupported VM type '" + vmtype + "'"; diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js index df6aba16..ffd38fb9 100644 --- a/www/manager6/storage/ContentView.js +++ b/www/manager6/storage/ContentView.js @@ -519,9 +519,9 @@ Ext.define('PVE.storage.ContentView', { }, handler: function(b, e, rec) { var vmtype; - if (rec.data.volid.match(/vzdump-qemu-/)) { + if (PVE.Utils.volume_is_qemu_backup(rec.data.volid, rec.data.format)) { vmtype = 'qemu'; - } else if (rec.data.volid.match(/vzdump-openvz-/) || rec.data.volid.match(/vzdump-lxc-/)) { + } else if (PVE.Utils.volume_is_lxc_backup(rec.data.volid, rec.data.format)) { vmtype = 'lxc'; } else { return;