[pve-devel] r5604 - pve-manager/pve2/www/manager

svn-commits at proxmox.com svn-commits at proxmox.com
Wed Feb 23 13:28:11 CET 2011


Author: dietmar
Date: 2011-02-23 13:28:11 +0100 (Wed, 23 Feb 2011)
New Revision: 5604

Modified:
   pve-manager/pve2/www/manager/ClusterConfig.js
Log:
s/id/userid/


Modified: pve-manager/pve2/www/manager/ClusterConfig.js
===================================================================
--- pve-manager/pve2/www/manager/ClusterConfig.js	2011-02-23 12:24:23 UTC (rev 5603)
+++ pve-manager/pve2/www/manager/ClusterConfig.js	2011-02-23 12:28:11 UTC (rev 5604)
@@ -11,12 +11,12 @@
 	    root: 'data',
 	    restful: true, // use GET, not POST
 	    fields: [ 
-		'id', 'firstname', 'lastname' , 'email', 'comment',
+		'userid', 'firstname', 'lastname' , 'email', 'comment',
 		{ type: 'boolean', name: 'enabled' }, 
 		{ type: 'date', dateFormat: 'timestamp', name: 'expire' },
 	    ],
-	    idProperty: 'id',
-	    sortInfo: { field: 'id', order: 'DESC' }
+	    idProperty: 'userid',
+	    sortInfo: { field: 'userid', order: 'DESC' }
 	});
 
 	var render_expire = function(date) {
@@ -32,11 +32,11 @@
 	    return first + " " + last;
 	};
 
-	var render_username = function(id) {
-	    return id.match(/^([^@]+)/)[1];
+	var render_username = function(userid) {
+	    return userid.match(/^([^@]+)/)[1];
 	};
-	var render_realm = function(id) {
-	    return id.match(/@([^@]+)$/)[1];
+	var render_realm = function(userid) {
+	    return userid.match(/@([^@]+)$/)[1];
 	};
 
 	Ext.apply(self, {
@@ -49,14 +49,14 @@
 		    width: 200,
 		    sortable: true,
 		    renderer: render_username,
-		    dataIndex: 'id'
+		    dataIndex: 'userid'
 		},
 		{
 		    header: 'Realm',
 		    width: 100,
 		    sortable: true,
 		    renderer: render_realm,
-		    dataIndex: 'id'
+		    dataIndex: 'userid'
 		},
 		{
 		    header: 'Enabled',



More information about the pve-devel mailing list