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 AF82769697 for ; Fri, 12 Feb 2021 16:01:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A753E283C8 for ; Fri, 12 Feb 2021 16:01:16 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 3D6E0283BF for ; Fri, 12 Feb 2021 16:01:16 +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 000CD40BCC for ; Fri, 12 Feb 2021 16:01:15 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 12 Feb 2021 16:01:15 +0100 Message-Id: <20210212150115.27602-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.225 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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] ui: dc/TokenEdit: fix editing existing tokens 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: Fri, 12 Feb 2021 15:01:16 -0000 we always have to calculate the url correctly, not only on creation otherwise we try to edit the token by doing a 'PUT' request on /access/users and not on /access/users/USERID/token/TOKENID Signed-off-by: Dominik Csapak --- www/manager6/dc/TokenEdit.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/www/manager6/dc/TokenEdit.js b/www/manager6/dc/TokenEdit.js index 3edf18cc..7039249c 100644 --- a/www/manager6/dc/TokenEdit.js +++ b/www/manager6/dc/TokenEdit.js @@ -21,14 +21,12 @@ Ext.define('PVE.dc.TokenEdit', { let me = this; let win = me.up('pveDcTokenEdit'); win.url = '/api2/extjs/access/users/'; - if (win.isCreate) { - let uid = encodeURIComponent(values.userid); - let tid = encodeURIComponent(values.tokenid); - delete values.userid; - delete values.tokenid; + let uid = encodeURIComponent(values.userid); + let tid = encodeURIComponent(values.tokenid); + delete values.userid; + delete values.tokenid; - win.url += `${uid}/token/${tid}`; - } + win.url += `${uid}/token/${tid}`; return values; }, column1: [ @@ -36,8 +34,8 @@ Ext.define('PVE.dc.TokenEdit', { xtype: 'pmxDisplayEditField', cbind: { editable: (get) => get('isCreate') && !get('fixedUser'), - submitValue: (get) => get('isCreate') || get('fixedUser'), }, + submitValue: true, editConfig: { xtype: 'pveUserSelector', allowBlank: false, @@ -54,6 +52,7 @@ Ext.define('PVE.dc.TokenEdit', { }, name: 'tokenid', fieldLabel: gettext('Token ID'), + submitValue: true, minLength: 2, allowBlank: false, }, -- 2.20.1