From 2771f0301a9998a9954d8b30f514a7ea85871425 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 27 Jun 2022 13:45:42 -0400 Subject: [PATCH] Fix #2249 Fix #2250 - issues with site deletion --- Oqtane.Client/Modules/Admin/Site/Index.razor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index d033a259..77593fcb 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -546,19 +546,19 @@ { try { - var sites = await SiteService.GetSitesAsync(); - if (sites.Count > 1) + var aliases = await AliasService.GetAliasesAsync(); + if (aliases.Any(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId)) { await SiteService.DeleteSiteAsync(PageState.Site.SiteId); await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId); - var aliases = await AliasService.GetAliasesAsync(); - foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId)) + foreach (Alias alias in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId)) { - await AliasService.DeleteAliasAsync(a.AliasId); + await AliasService.DeleteAliasAsync(alias.AliasId); } - NavigationManager.NavigateTo(NavigateUrl("admin/sites")); + aliases = await AliasService.GetAliasesAsync(); + NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliases.First().Name, true); } else {