[pve-devel] r5917 - in pve-manager/pve2/www/new: form qemu

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-06 13:07:20 +0200 (Fri, 06 May 2011)
New Revision: 5917

Modified:
   pve-manager/pve2/www/new/form/ComboGrid.js
   pve-manager/pve2/www/new/form/FileSelector.js
   pve-manager/pve2/www/new/qemu/CreateWizard.js
Log:
filter correct content


Modified: pve-manager/pve2/www/new/form/ComboGrid.js
===================================================================
--- pve-manager/pve2/www/new/form/ComboGrid.js	2011-05-06 08:43:46 UTC (rev 5916)
+++ pve-manager/pve2/www/new/form/ComboGrid.js	2011-05-06 11:07:20 UTC (rev 5917)
@@ -9,7 +9,7 @@
     computeHeight: function() {
 	var me = this;
 	var lh = PVE.Utils.gridLineHeigh();
-	var count = me.store.totalCount;
+	var count = me.store.getCount();
 	return (count > 10) ? 10*lh : 26+count*lh;
     },
 

Modified: pve-manager/pve2/www/new/form/FileSelector.js
===================================================================
--- pve-manager/pve2/www/new/form/FileSelector.js	2011-05-06 08:43:46 UTC (rev 5916)
+++ pve-manager/pve2/www/new/form/FileSelector.js	2011-05-06 11:07:20 UTC (rev 5917)
@@ -23,9 +23,13 @@
 	if (!(me.storage && me.nodename && change))
 	    return;
 	
+	var url = '/api2/json/nodes/' + me.nodename + '/storage/' + me.storage;
+	if (me.storageContent)
+	    url += '?content=' + me.storageContent;
+
 	me.store.setProxy({
 	    type: 'pve',
-	    url: '/api2/json/nodes/' + me.nodename + '/storage/' + me.storage
+	    url: url
 	});
 
 	me.store.load();
@@ -36,7 +40,6 @@
 
 	var store = Ext.create('Ext.data.Store', {
 	    fields: [ 'volid', 'format', 'size', 'used', 'vmid' ],
-	    autoDestory: true
 	});
 
 	Ext.apply(me, {

Modified: pve-manager/pve2/www/new/qemu/CreateWizard.js
===================================================================
--- pve-manager/pve2/www/new/qemu/CreateWizard.js	2011-05-06 08:43:46 UTC (rev 5916)
+++ pve-manager/pve2/www/new/qemu/CreateWizard.js	2011-05-06 11:07:20 UTC (rev 5917)
@@ -12,6 +12,7 @@
 
 	var cdfilesel = Ext.create('PVE.form.FileSelector', {
 	    name: 'cdimage',
+	    storageContent: 'iso',
 	    fieldLabel: 'ISO Image',
 	    labelAlign: 'right',
 	    allowBlank: false