From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D5EDA1FF15E for ; Fri, 23 Aug 2024 13:07:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3911DE0D2; Fri, 23 Aug 2024 13:07:52 +0200 (CEST) From: Christoph Heiss To: pbs-devel@lists.proxmox.com Date: Fri, 23 Aug 2024 13:07:22 +0200 Message-ID: <20240823110737.831304-3-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240823110737.831304-1-c.heiss@proxmox.com> References: <20240823110737.831304-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.270 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy ENA_SUBJ_ODD_CASE 2.6 Subject has odd case KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH widget-toolkit v4 2/7] panel: AuthView: make `useTypeInUrl` property per-realm X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Signed-off-by: Christoph Heiss --- Changes v3 -> v4: * use destructuring syntax for extracting `useTypeInUrl` Changes v2 -> v3: * no changes Changes v1 -> v2: * no changes src/Schema.js | 4 ++++ src/panel/AuthView.js | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Schema.js b/src/Schema.js index 42541e0..6921986 100644 --- a/src/Schema.js +++ b/src/Schema.js @@ -8,6 +8,7 @@ Ext.define('Proxmox.Schema', { // a singleton edit: false, pwchange: true, sync: false, + useTypeInUrl: false, }, openid: { name: gettext('OpenID Connect Server'), @@ -18,6 +19,7 @@ Ext.define('Proxmox.Schema', { // a singleton pwchange: false, sync: false, iconCls: 'pmx-itype-icon-openid-logo', + useTypeInUrl: true, }, ldap: { name: gettext('LDAP Server'), @@ -28,6 +30,7 @@ Ext.define('Proxmox.Schema', { // a singleton tfa: true, pwchange: false, sync: true, + useTypeInUrl: true, }, ad: { name: gettext('Active Directory Server'), @@ -38,6 +41,7 @@ Ext.define('Proxmox.Schema', { // a singleton tfa: true, pwchange: false, sync: true, + useTypeInUrl: true, }, }, // to add or change existing for product specific ones diff --git a/src/panel/AuthView.js b/src/panel/AuthView.js index 52b6cac..cdea14b 100644 --- a/src/panel/AuthView.js +++ b/src/panel/AuthView.js @@ -11,7 +11,6 @@ Ext.define('Proxmox.panel.AuthView', { }, baseUrl: '/access/domains', - useTypeInUrl: false, columns: [ { @@ -45,9 +44,11 @@ Ext.define('Proxmox.panel.AuthView', { openEditWindow: function(authType, realm) { let me = this; + const { useTypeInUrl } = Proxmox.Schema.authDomains[authType]; + Ext.create('Proxmox.window.AuthEditBase', { baseUrl: me.baseUrl, - useTypeInUrl: me.useTypeInUrl, + useTypeInUrl, authType, realm, listeners: { @@ -123,7 +124,7 @@ Ext.define('Proxmox.panel.AuthView', { xtype: 'proxmoxStdRemoveButton', getUrl: (rec) => { let url = me.baseUrl; - if (me.useTypeInUrl) { + if (Proxmox.Schema.authDomains[rec.data.type].useTypeInUrl) { url += `/${rec.get('type')}`; } url += `/${rec.getId()}`; -- 2.45.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel