From dd2a69814703fc10cd6baad9bca50edffd8d96f6 Mon Sep 17 00:00:00 2001 From: Cody Date: Wed, 20 Dec 2023 14:17:23 -0800 Subject: [PATCH 1/6] Refreshes settings page if logo changes. --- Oqtane.Client/Modules/Admin/Site/Index.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index c55eb2ba..cd7ba367 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -673,6 +673,10 @@ } else { + if (logofileid != -1 && logofileid != _logofileid) + { + NavigationManager.Refresh(); + } AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success); await ScrollToPageTop(); } From 4b938db0c196a900e1db2c7048026795b97617fb Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 22 Dec 2023 10:28:14 -0800 Subject: [PATCH 2/6] refresh = true when logo is updated --- Oqtane.Client/Modules/Admin/Site/Index.razor | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index cd7ba367..06190904 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -579,6 +579,10 @@ if (logofileid != -1) { site.LogoFileId = logofileid; + if (logofileid != _logofileid) + { + refresh = true; + } } int? faviconFieldId = _faviconfilemanager.GetFileId(); if (faviconFieldId == -1) faviconFieldId = null; From 9612e4d4e92955caf6b36bdcf83ced740bc57c8f Mon Sep 17 00:00:00 2001 From: Cody Date: Fri, 22 Dec 2023 10:30:28 -0800 Subject: [PATCH 3/6] Removes unnecessary logo refresh logic. --- Oqtane.Client/Modules/Admin/Site/Index.razor | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 06190904..874c3c98 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -677,10 +677,6 @@ } else { - if (logofileid != -1 && logofileid != _logofileid) - { - NavigationManager.Refresh(); - } AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success); await ScrollToPageTop(); } From 49f7ee604265e8e7a6d5527e0d8e124c163e5371 Mon Sep 17 00:00:00 2001 From: Cody Date: Sat, 23 Dec 2023 09:25:02 -0800 Subject: [PATCH 4/6] change to reload from refresh to update site logo --- Oqtane.Client/Modules/Admin/Site/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 874c3c98..b9d94457 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -581,7 +581,7 @@ site.LogoFileId = logofileid; if (logofileid != _logofileid) { - refresh = true; + reload = true; } } int? faviconFieldId = _faviconfilemanager.GetFileId(); From 006cd1ee896629a93de7b6a0210b4f1c9dc97704 Mon Sep 17 00:00:00 2001 From: Cody Date: Sat, 23 Dec 2023 11:26:57 -0800 Subject: [PATCH 5/6] Refresh Page On Client After Saving Changed Logo --- Oqtane.Client/Modules/Admin/Site/Index.razor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index b9d94457..f6cc5ee5 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -581,7 +581,8 @@ site.LogoFileId = logofileid; if (logofileid != _logofileid) { - reload = true; + _logofileid = logofileid; + refresh = true; } } int? faviconFieldId = _faviconfilemanager.GetFileId(); From 8ed11cdc0780f1753978caba9c4b9edaee64b8c9 Mon Sep 17 00:00:00 2001 From: Cody Date: Sat, 23 Dec 2023 12:02:58 -0800 Subject: [PATCH 6/6] Adds the comment for client logo refresh boolean --- Oqtane.Client/Modules/Admin/Site/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index f6cc5ee5..3ad4d605 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -582,7 +582,7 @@ if (logofileid != _logofileid) { _logofileid = logofileid; - refresh = true; + refresh = true; // needs to be refreshed on client } } int? faviconFieldId = _faviconfilemanager.GetFileId();