From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id C5D757D8A0 for ; Tue, 9 Nov 2021 12:28:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2E03B059 for ; Tue, 9 Nov 2021 12:27:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DC799AFC6 for ; Tue, 9 Nov 2021 12:27:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B74884450F for ; Tue, 9 Nov 2021 12:27:26 +0100 (CET) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Tue, 9 Nov 2021 12:27:09 +0100 Message-Id: <20211109112721.130935-21-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211109112721.130935-1-w.bumiller@proxmox.com> References: <20211109112721.130935-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.521 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 2/7] www: use UserSelector from wtk X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2021 11:28:23 -0000 Signed-off-by: Wolfgang Bumiller --- www/manager6/dc/ACLView.js | 2 +- www/manager6/dc/TokenEdit.js | 2 +- www/manager6/dc/UserView.js | 2 +- www/manager6/form/UserSelector.js | 83 ++++--------------------------- 4 files changed, 14 insertions(+), 75 deletions(-) diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js index 65abd8cd..a5776ac6 100644 --- 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 7039249c..3b25c739 100644 --- 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 ef394bdb..9c84bf7d 100644 --- 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 2d4c8c22..8fb31d7e 100644 --- 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', }); - - -- 2.30.2