Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

cleanup and ensure site level scripts work properly

Browse Source
This commit is contained in:
sbwalker
2023-06-21 15:49:00 -04:00
parent 43bcfb9a4e
commit 86fbdced1b
7 changed files with 39 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Oqtane.Client/UI/SiteRouter.razor
View File

@ -513,22 +513,25 @@
{
foreach (var resource in resources)
{
if (resource.Url.StartsWith("~"))
if (resource.Level != ResourceLevel.Site)
{
resource.Url = resource.Url.Replace("~", "/" + type + "/" + name + "/").Replace("//", "/");
}
if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
{
resource.Url = alias.BaseUrl + resource.Url;
}
if (resource.Url.StartsWith("~"))
{
resource.Url = resource.Url.Replace("~", "/" + type + "/" + name + "/").Replace("//", "/");
}
if (!resource.Url.Contains("://") && alias.BaseUrl != "" && !resource.Url.StartsWith(alias.BaseUrl))
{
resource.Url = alias.BaseUrl + resource.Url;
}
// ensure resource does not exist already
if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower()))
{
resource.Level = level;
resource.Namespace = name;
pageresources.Add(resource);
}
// ensure resource does not exist already
if (!pageresources.Exists(item => item.Url.ToLower() == resource.Url.ToLower()))
{
resource.Level = level;
resource.Namespace = name;
pageresources.Add(resource);
}
}
}
}
return pageresources;