From b0faea8a7864558bb051ad57ac7d4e3aa5eb4c14 Mon Sep 17 00:00:00 2001 From: tabarra Date: Wed, 3 Jan 2024 19:06:05 -0300 Subject: [PATCH] fix: admin manager recursive iframe --- panel/src/pages/Iframe.tsx | 2 ++ web/main/adminManager.ejs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/panel/src/pages/Iframe.tsx b/panel/src/pages/Iframe.tsx index 09db660d0..648bcecd5 100644 --- a/panel/src/pages/Iframe.tsx +++ b/panel/src/pages/Iframe.tsx @@ -3,6 +3,8 @@ type Props = { }; export default function Iframe({ legacyUrl }: Props) { + //NOTE: if you open adminManager with autofill, the autofill will continue in the searchParams + //This is an annoying issue to fix, so #wontfix const searchParams = location.search ?? ''; const hashParams = location.hash ?? ''; return ( diff --git a/web/main/adminManager.ejs b/web/main/adminManager.ejs index 1352f1a87..5903b5d13 100644 --- a/web/main/adminManager.ejs +++ b/web/main/adminManager.ejs @@ -197,7 +197,7 @@ citizenfxID: params.get('citizenfx') ?? '', discordID: discordValue && discordValue.includes(':') ? discordValue.split(':')[1] : '', } - window.history.pushState(null, 'txAdmin', 'adminManager?'); + window.history.pushState(null, 'txAdmin', 'legacy/adminManager?'); getAdminModal(); }