[pve-devel] r5598 - in pve-manager/pve2/www/manager: . window

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-23 13:15:12 +0100 (Wed, 23 Feb 2011)
New Revision: 5598

Modified:
   pve-manager/pve2/www/manager/ClusterConfig.js
   pve-manager/pve2/www/manager/window/LoginWindow.js
Log:
s/id/realm/


Modified: pve-manager/pve2/www/manager/ClusterConfig.js
===================================================================
--- pve-manager/pve2/www/manager/ClusterConfig.js	2011-02-23 12:09:44 UTC (rev 5597)
+++ pve-manager/pve2/www/manager/ClusterConfig.js	2011-02-23 12:15:12 UTC (rev 5598)
@@ -210,9 +210,9 @@
 	    autoDestory: true,
 	    root: 'data',
 	    restful: true, // use GET, not POST
-	    fields: [ 'id', 'type', 'comment' ],
-	    idProperty: 'id',
-	    sortInfo: { field: 'id', order: 'DESC' }
+	    fields: [ 'realm', 'type', 'comment' ],
+	    idProperty: 'realm',
+	    sortInfo: { field: 'realm', order: 'DESC' }
 	});
 
 	Ext.apply(self, {
@@ -224,7 +224,7 @@
 		    header: 'Realm',
 		    width: 100,
 		    sortable: true,
-		    dataIndex: 'id'
+		    dataIndex: 'realm'
 		},
 		{
 		    header: 'Type',

Modified: pve-manager/pve2/www/manager/window/LoginWindow.js
===================================================================
--- pve-manager/pve2/www/manager/window/LoginWindow.js	2011-02-23 12:09:44 UTC (rev 5597)
+++ pve-manager/pve2/www/manager/window/LoginWindow.js	2011-02-23 12:15:12 UTC (rev 5598)
@@ -36,9 +36,9 @@
 	    autoDestory: true,
 	    root: 'data',
 	    restful: true, // use GET, not POST
-	    fields: [ 'id', 'comment', 'default' ],
-	    idProperty: 'id',
-	    sortInfo: { field: 'id', order: 'DESC' }
+	    fields: [ 'realm', 'comment', 'default' ],
+	    idProperty: 'realm',
+	    sortInfo: { field: 'realm', order: 'DESC' }
 	});
 
 	var combo = new Ext.form.ComboBox({
@@ -50,7 +50,7 @@
 	    forceSelection: true,
 	    autoSelect: false,
 	    triggerAction: 'all',
-	    valueField: 'id',
+	    valueField: 'realm',
 	    displayField: 'comment'
 	});
 
@@ -59,10 +59,10 @@
 		if (success) {
 		    var def;
 		    if (r[0] && r[0].data)
-			def = r[0].data.id;
+			def = r[0].data.realm;
 		    Ext.each(r, function(record) {
 			if (record.data && record.data["default"]) 
-			    def = record.data.id;
+			    def = record.data.realm;
 		    });
 		    if (def)
 			combo.setValue(def);