From efb38000c754baddfb0c005f3a4507271e4cf68c Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 10 Feb 2012 08:38:06 +0100 Subject: [PATCH] cleanups --- debian/changelog.Debian | 8 ++++++++ www/manager/form/CompressionSelector.js | 21 ++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/debian/changelog.Debian b/debian/changelog.Debian index 1d333774..16e891fe 100644 --- a/debian/changelog.Debian +++ b/debian/changelog.Debian @@ -1,5 +1,13 @@ pve-manager (2.0-20) unstable; urgency=low + * improve user management + + * implement permission checks + + * improve backup GUI (allow to select lzo/gzip) + + * add pools to resource list + * fix bug #85: allow root@pam to generate tickets for other users * fix bug #86: correctly decode cookie diff --git a/www/manager/form/CompressionSelector.js b/www/manager/form/CompressionSelector.js index 52fbfe7c..aad2cb1a 100644 --- a/www/manager/form/CompressionSelector.js +++ b/www/manager/form/CompressionSelector.js @@ -1,14 +1,25 @@ -Ext.define('PVE.form.CompressionSelector', { +Ext.define('PVE.form.CPUModelSelector', { extend: 'PVE.form.KVComboBox', - alias: ['widget.pveCompressionSelector'], + alias: ['widget.CPUModelSelector'], initComponent: function() { var me = this; me.data = [ - ['', 'none'], - ['lzo', 'LZO (fast)'], - ['gzip', 'GZIP (good)'], + ['', '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'] ]; me.callParent();