public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Christoph Heiss <c.heiss@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH widget-toolkit v2 02/14] panel: AuthView: make `useTypeInUrl` property per-realm
Date: Mon, 12 Aug 2024 15:54:59 +0200	[thread overview]
Message-ID: <20240812135550.1461574-3-c.heiss@proxmox.com> (raw)
In-Reply-To: <20240812135550.1461574-1-c.heiss@proxmox.com>

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
 src/Schema.js         | 4 ++++
 src/panel/AuthView.js | 5 ++---
 2 files changed, 6 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..944a812 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: [
 	{
@@ -47,7 +46,7 @@ Ext.define('Proxmox.panel.AuthView', {
 	let me = this;
 	Ext.create('Proxmox.window.AuthEditBase', {
 	    baseUrl: me.baseUrl,
-	    useTypeInUrl: me.useTypeInUrl,
+	    useTypeInUrl: Proxmox.Schema.authDomains[authType].useTypeInUrl,
 	    authType,
 	    realm,
 	    listeners: {
@@ -123,7 +122,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


  parent reply	other threads:[~2024-08-12 13:56 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-12 13:54 [pbs-devel] [PATCH proxmox-backup/pwt v2 00/14] fix #5379: introduce default auth realm option Christoph Heiss
2024-08-12 13:54 ` [pbs-devel] [PATCH widget-toolkit v2 01/14] window: AuthEditBase: include more information in thrown errors Christoph Heiss
2024-08-12 13:54 ` Christoph Heiss [this message]
2024-08-12 13:55 ` [pbs-devel] [PATCH widget-toolkit v2 03/14] window: add panel for editing simple, built-in realms Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH widget-toolkit v2 04/14] schema: make PAM realm editable using new AuthSimple panel Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH widget-toolkit v2 05/14] fix #5379: panel: AuthView: add column displaying whether the realm is default Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH widget-toolkit v2 06/14] fix #5379: window: AuthEdit{LDAP, OpenId}: add 'Default realm' checkbox Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 07/14] fix #5379: api-types: add `default` field to all realm types Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 08/14] fix #5379: api2: access: set default realm accordingly on individual update Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 09/14] api-types: introduce proper types for PAM and PBS realms Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 10/14] config: use new dedicated PAM and PBS realm types Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 11/14] api2: access: add update support for built-in PAM realm Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 12/14] api2: access: add update support for built-in PBS realm Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 13/14] www: AccessControl: make `useTypeInUrl` property per-realm Christoph Heiss
2024-08-12 13:55 ` [pbs-devel] [PATCH proxmox-backup v2 14/14] www: utils: make built-in pbs realm editable using new AuthSimplePanel Christoph Heiss
2024-08-12 16:26 ` [pbs-devel] [PATCH proxmox-backup/pwt v2 00/14] fix #5379: introduce default auth realm option Christoph Heiss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240812135550.1461574-3-c.heiss@proxmox.com \
    --to=c.heiss@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal