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

Merge pull request #4082 from sbwalker/dev

Browse Source 
remove changes to allow path to support urls - urls should be specified as redirects
This commit is contained in:
Shaun Walker
2024-03-29 10:15:42 -04:00
committed by GitHub
parent 8d8436f1f1 26220b2f54
commit 5de988a2e6
2 changed files with 45 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Oqtane.Client/Modules/Admin/Pages/Add.razor
View File

@ -385,16 +385,11 @@
page.ParentId = Int32.Parse(_parentid); page.ParentId = Int32.Parse(_parentid);
} }
// path can be a link to an external url
if (!_path.Contains("://"))
{
if (string.IsNullOrEmpty(_path)) if (string.IsNullOrEmpty(_path))
{ {
_path = _name; _path = _name;
} }
(_path, string parameters) = Utilities.ParsePath(_path);
if (_path.Contains("/")) if (_path.Contains("/"))
{ {
if (_path.EndsWith("/") && _path != "/") if (_path.EndsWith("/") && _path != "/")
@ -419,12 +414,6 @@
page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path); page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
} }
} }
page.Path += parameters;
}
else
{
page.Path = _path;
}
var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId); var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
if (_pages.Any(item => item.Path == page.Path)) if (_pages.Any(item => item.Path == page.Path))
@ -496,16 +485,9 @@
NavigationManager.NavigateTo(PageState.ReturnUrl, true); NavigationManager.NavigateTo(PageState.ReturnUrl, true);
} }
else else
{
if (!page.Path.Contains("://"))
{ {
NavigationManager.NavigateTo(page.Path); // redirect to new page created NavigationManager.NavigateTo(page.Path); // redirect to new page created
} }
else
{
NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
}
}
} }
else else
{ {

20
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -380,7 +380,7 @@
} }
else else
{ {
if (_path.Contains("/") & !_path.Contains("://")) if (_path.Contains("/"))
{ {
_path = _path.Substring(_path.LastIndexOf("/") + 1); _path = _path.Substring(_path.LastIndexOf("/") + 1);
} }
@ -529,16 +529,11 @@
_page.ParentId = Int32.Parse(_parentid); _page.ParentId = Int32.Parse(_parentid);
} }
// path can be a link to an external url
if (!_path.Contains("://"))
{
if (string.IsNullOrEmpty(_path)) if (string.IsNullOrEmpty(_path))
{ {
_path = _name; _path = _name;
} }
(_path, string parameters) = Utilities.ParsePath(_path);
if (_path.Contains("/")) if (_path.Contains("/"))
{ {
if (_path.EndsWith("/") && _path != "/") if (_path.EndsWith("/") && _path != "/")
@ -563,12 +558,6 @@
_page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path); _page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
} }
} }
_page.Path += parameters;
}
else
{
_page.Path = _path;
}
var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId); var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
if (_pages.Any(item => item.Path == _page.Path && item.PageId != _page.PageId)) if (_pages.Any(item => item.Path == _page.Path && item.PageId != _page.PageId))
@ -657,16 +646,9 @@
NavigationManager.NavigateTo(PageState.ReturnUrl, true); NavigationManager.NavigateTo(PageState.ReturnUrl, true);
} }
else else
{
if (!_page.Path.Contains("://"))
{ {
NavigationManager.NavigateTo(NavigateUrl(), true); // redirect to page being edited NavigationManager.NavigateTo(NavigateUrl(), true); // redirect to page being edited
} }
else
{
NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
}
}
} }
else else
{ {