diff --git a/debian/changelog.Debian b/debian/changelog.Debian index 1496f667..2600a2dd 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,3 +1,11 @@ +pve-manager (2.0-22) unstable; urgency=low + + * fix lint errors + + * fix compression selector + + -- Proxmox Support Team Fri, 10 Feb 2012 12:26:39 +0100 + pve-manager (2.0-21) unstable; urgency=low * fix postinst script (write correct /root/.forward) diff --git a/defines.mk b/defines.mk index 3a7b5e80..951d2df6 100644 --- a/defines.mk +++ b/defines.mk @@ -2,7 +2,7 @@ RELEASE=2.0 VERSION=2.0 PACKAGE=pve-manager -PACKAGERELEASE=21 +PACKAGERELEASE=22 BINDIR=${DESTDIR}/usr/bin PERLLIBDIR=${DESTDIR}/usr/share/perl5 diff --git a/www/manager/form/ComboGrid.js b/www/manager/form/ComboGrid.js index 87e9925b..1340852e 100644 --- a/www/manager/form/ComboGrid.js +++ b/www/manager/form/ComboGrid.js @@ -97,7 +97,7 @@ Ext.define('PVE.form.ComboGrid', { if (me.enableAfterLoad) { delete me.enableAfterLoad; - me.setDisabled(false); + me.setDisabled(false); } var def = me.getValue(); diff --git a/www/manager/form/CompressionSelector.js b/www/manager/form/CompressionSelector.js index 52b89431..fa3adeb3 100644 --- a/www/manager/form/CompressionSelector.js +++ b/www/manager/form/CompressionSelector.js @@ -6,20 +6,9 @@ Ext.define('PVE.form.CompressionSelector', { var me = this; me.data = [ - ['', 'Default (qemu64)'], - ['486', '486'], - ['athlon', 'athlon'], - ['core2duo', 'core2duo'], - ['coreduo', 'coreduo'], - ['kvm32', 'kvm32'], - ['kvm64', 'kvm64'], - ['pentium', 'pentium'], - ['pentium2', 'pentium2'], - ['pentium3', 'pentium3'], - ['phenom', 'phenom'], - ['qemu32', 'qemu32'], - ['qemu64', 'qemu64'], - ['host', 'host'] + ['', 'none'], + ['lzo', 'LZO (fast)'], + ['gzip', 'GZIP (good)'] ]; me.callParent(); diff --git a/www/manager/qemu/CreateWizard.js b/www/manager/qemu/CreateWizard.js index e37b05e4..b5b82dfb 100644 --- a/www/manager/qemu/CreateWizard.js +++ b/www/manager/qemu/CreateWizard.js @@ -77,7 +77,7 @@ Ext.define('PVE.qemu.CreateWizard', { name: 'pool', value: '', allowBlank: true - }, + } ], onGetValues: function(values) { if (!values.name) { diff --git a/www/manager/window/Backup.js b/www/manager/window/Backup.js index 5787de00..90547386 100644 --- a/www/manager/window/Backup.js +++ b/www/manager/window/Backup.js @@ -43,10 +43,9 @@ Ext.define('PVE.window.Backup', { name: 'mode' }, { - xtype: 'pvecheckbox', + xtype: 'pveCompressionSelector', name: 'compress', - uncheckedValue: 0, - checked: true, + value: 'lzo', fieldLabel: 'Compress' } ] @@ -59,16 +58,18 @@ Ext.define('PVE.window.Backup', { handler: function(){ var storage = storagesel.getValue(); var values = form.getValues(); - console.dir(me.vmid, me.nodename, values.online); - - PVE.Utils.API2Request({ - url: '/nodes/' + me.nodename + '/vzdump', - params: { + var params = { storage: storage, vmid: me.vmid, - compress: values.compress, mode: values.mode - }, + }; + if (values.compress) { + params.compress = values.compress; + } + + PVE.Utils.API2Request({ + url: '/nodes/' + me.nodename + '/vzdump', + params: params, method: 'POST', failure: function (response, opts) { Ext.Msg.alert('Error',response.htmlStatus);