From: Thomas Skinner <thomas@atskinner.net>
To: pve-devel@lists.proxmox.com
Cc: Thomas Skinner <thomas@atskinner.net>
Subject: [pve-devel] [PATCH manager 1/1] fix #6311: ui: prevent consent text from showing twice for oidc
Date: Sun, 13 Apr 2025 21:18:36 -0500 [thread overview]
Message-ID: <20250414021836.1469242-2-thomas@atskinner.net> (raw)
In-Reply-To: <20250414021836.1469242-1-thomas@atskinner.net>
Signed-off-by: Thomas Skinner <thomas@atskinner.net>
---
www/manager6/window/LoginWindow.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/www/manager6/window/LoginWindow.js b/www/manager6/window/LoginWindow.js
index b4dff0c1..a1ba3cdb 100644
--- a/www/manager6/window/LoginWindow.js
+++ b/www/manager6/window/LoginWindow.js
@@ -22,12 +22,15 @@ Ext.define('PVE.window.LoginWindow', {
init: async function() {
if (Proxmox.ConsentText) {
- Ext.create("Proxmox.window.ConsentModal", {
- autoShow: true,
- consent: Proxmox.Markdown.parse(
- Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
- ),
- });
+ let oidc_auth_redirect = Proxmox.Utils.getOpenIDRedirectionAuthorization();
+ if (oidc_auth_redirect === undefined) {
+ Ext.create("Proxmox.window.ConsentModal", {
+ autoShow: true,
+ consent: Proxmox.Markdown.parse(
+ Proxmox.Utils.base64ToUtf8(Proxmox.ConsentText),
+ ),
+ });
+ }
}
},
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-04-14 2:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 2:18 [pve-devel] [PATCH SERIES manager] " Thomas Skinner
2025-04-14 2:18 ` Thomas Skinner [this message]
2025-04-14 12:53 ` [pve-devel] [PATCH manager 1/1] " Gabriel Goller
2025-04-15 12:07 ` Thomas Lamprecht
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=20250414021836.1469242-2-thomas@atskinner.net \
--to=thomas@atskinner.net \
--cc=pve-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