www: use UserSelector from wtk

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js
index 65abd8cdb0c81d434ba93e1c48135a526f56ce83..a5776ac623e0687d6072690c3948d4b588cfd694 100644 (file)
--- a/www/manager6/dc/ACLView.js
+++ b/www/manager6/dc/ACLView.js
@@ -32,7 +32,7 @@ Ext.define('PVE.dc.ACLAdd', {
        } else if (me.aclType === 'user') {
            me.subject = gettext("User Permission");
            items.push({
-               xtype: 'pveUserSelector',
+               xtype: 'pmxUserSelector',
                name: 'users',
                fieldLabel: gettext('User'),
            });

diff --git a/www/manager6/dc/TokenEdit.js b/www/manager6/dc/TokenEdit.js
index 7039249cfaaacd36832703e89b905f8420e9ad2b..3b25c739fc035135edf0923a4eafed6f1d3e79bc 100644 (file)
--- a/www/manager6/dc/TokenEdit.js
+++ b/www/manager6/dc/TokenEdit.js
@@ -37,7 +37,7 @@ Ext.define('PVE.dc.TokenEdit', {
                },
                submitValue: true,
                editConfig: {
-                   xtype: 'pveUserSelector',
+                   xtype: 'pmxUserSelector',
                    allowBlank: false,
                },
                name: 'userid',

diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js
index ef394bdb5473f579baae604aed866c0ac5ecdf88..9c84bf7dfc44be8e157f780fa85dd9cfda093bf3 100644 (file)
--- a/www/manager6/dc/UserView.js
+++ b/www/manager6/dc/UserView.js
@@ -15,7 +15,7 @@ Ext.define('PVE.dc.UserView', {
 
        var store = new Ext.data.Store({
             id: "users",
-           model: 'pve-users',
+           model: 'pmx-users',
            sorters: {
                property: 'userid',
                order: 'DESC',

diff --git a/www/manager6/form/UserSelector.js b/www/manager6/form/UserSelector.js
index 2d4c8c22971b2c6eeff4a3364224535b98a41236..8fb31d7e39744df2bde14aca8868afda93e28a8a 100644 (file)
--- a/www/manager6/form/UserSelector.js
+++ b/www/manager6/form/UserSelector.js
@@ -1,74 +1,13 @@
-Ext.define('PVE.form.UserSelector', {
-    extend: 'Proxmox.form.ComboGrid',
-    alias: ['widget.pveUserSelector'],
-
-    allowBlank: false,
-    autoSelect: false,
-    valueField: 'userid',
-    displayField: 'userid',
-
-    editable: true,
-    anyMatch: true,
-    forceSelection: true,
-
-    initComponent: function() {
-       var me = this;
-
-       var store = new Ext.data.Store({
-           model: 'pve-users',
-           sorters: [{
-               property: 'userid',
-           }],
-       });
-
-       Ext.apply(me, {
-           store: store,
-            listConfig: {
-               columns: [
-                   {
-                       header: gettext('User'),
-                       sortable: true,
-                       dataIndex: 'userid',
-                       renderer: Ext.String.htmlEncode,
-                       flex: 1,
-                   },
-                   {
-                       header: gettext('Name'),
-                       sortable: true,
-                       renderer: PVE.Utils.render_full_name,
-                       dataIndex: 'firstname',
-                       flex: 1,
-                   },
-                   {
-                       header: gettext('Comment'),
-                       sortable: false,
-                       dataIndex: 'comment',
-                       renderer: Ext.String.htmlEncode,
-                       flex: 1,
-                   },
-               ],
-           },
-       });
-
-        me.callParent();
-
-       store.load({ params: { enabled: 1 } });
+Ext.define('pmx-users', {
+    extend: 'Ext.data.Model',
+    fields: [
+       'userid', 'firstname', 'lastname', 'email', 'comment',
+       { type: 'boolean', name: 'enable' },
+       { type: 'date', dateFormat: 'timestamp', name: 'expire' },
+    ],
+    proxy: {
+       type: 'proxmox',
+       url: "/api2/json/access/users",
     },
-
-}, function() {
-    Ext.define('pve-users', {
-       extend: 'Ext.data.Model',
-       fields: [
-           'userid', 'firstname', 'lastname', 'email', 'comment',
-           { type: 'boolean', name: 'enable' },
-           { type: 'date', dateFormat: 'timestamp', name: 'expire' },
-       ],
-       proxy: {
-            type: 'proxmox',
-           url: "/api2/json/access/users",
-       },
-       idProperty: 'userid',
-    });
+    idProperty: 'userid',
 });
-
-