[pve-devel] r6341 - in pve-manager/pve2: . www/manager/form www/manager/storage

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-21 10:10:31 +0200 (Thu, 21 Jul 2011)
New Revision: 6341

Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/www/manager/form/StorageSelector.js
   pve-manager/pve2/www/manager/storage/StatusView.js
Log:
 display 'avail'


Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-07-21 07:05:19 UTC (rev 6340)
+++ pve-manager/pve2/ChangeLog	2011-07-21 08:10:31 UTC (rev 6341)
@@ -1,5 +1,8 @@
 2011-07-21  Proxmox Support Team  <support at proxmox.com>
 
+	* www/manager/form/StorageSelector.js: display 'avail' instead of
+	'used'
+
 	* lib/PVE/API2/Cluster.pm (resources): do not list disabled storages
 
 	* www/manager/qemu/CreateWizard.js: allow to select HD device 

Modified: pve-manager/pve2/www/manager/form/StorageSelector.js
===================================================================
--- pve-manager/pve2/www/manager/form/StorageSelector.js	2011-07-21 07:05:19 UTC (rev 6340)
+++ pve-manager/pve2/www/manager/form/StorageSelector.js	2011-07-21 08:10:31 UTC (rev 6341)
@@ -35,7 +35,7 @@
 	me.nodename = undefined; 
 
 	var store = Ext.create('Ext.data.Store', {
-	    fields: [ 'storage', 'active', 'type', 'used', 'total' ]
+	    fields: [ 'storage', 'active', 'type', 'avail', 'total' ]
 	});
 
 	Ext.apply(me, {
@@ -57,14 +57,14 @@
 			dataIndex: 'type'
 		    },
 		    {
-			header: 'Used',  
-			width: 60, 
-			dataIndex: 'used', 
+			header: 'Avail',  
+			width: 80, 
+			dataIndex: 'avail', 
 			renderer: PVE.Utils.format_size 
 		    },
 		    {
 			header: 'Capacity',  
-			width: 60, 
+			width: 80, 
 			dataIndex: 'total', 
 			renderer: PVE.Utils.format_size 
 		    }

Modified: pve-manager/pve2/www/manager/storage/StatusView.js
===================================================================
--- pve-manager/pve2/www/manager/storage/StatusView.js	2011-07-21 07:05:19 UTC (rev 6340)
+++ pve-manager/pve2/www/manager/storage/StatusView.js	2011-07-21 08:10:31 UTC (rev 6341)
@@ -49,7 +49,12 @@
 	    used: {
 		header: 'Used', 
 		required: true, 
-		renderer: PVE.Utils.render_size
+		renderer: function(value) {
+		    // do not confuse users with filesystem details
+		    var total = me.getObjectValue('total', 0);
+		    var avail = me.getObjectValue('avail', 0);
+		    return PVE.Utils.render_size(total - avail);
+		}
 	    },
 	    avail: {
 		header: 'Avail',