Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use PageState.Uri rather than creating a new Uri object

Browse Source
This commit is contained in:
Shaun Walker 2022-01-15 12:58:47 -05:00
parent ea4587d842
commit cc9802a0d8
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -372,8 +372,7 @@ else
if (installation.Success) if (installation.Success)
{ {
var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0]; var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
var uri = new Uri(NavigationManager.Uri); NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
} }
else else
{ {

8
Oqtane.Client/Modules/Admin/Sites/Index.razor
View File

@ -30,15 +30,11 @@ else
@code { @code {
private List<Alias> _sites; private List<Alias> _sites;
private string _scheme;
public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
var uri = new Uri(NavigationManager.Uri);
_scheme = uri.Scheme + "://";
var aliases = await AliasService.GetAliasesAsync(); var aliases = await AliasService.GetAliasesAsync();
_sites = new List<Alias>(); _sites = new List<Alias>();
foreach (Alias alias in aliases) foreach (Alias alias in aliases)
@ -52,11 +48,11 @@ else
private void Edit(string name) private void Edit(string name)
{ {
NavigationManager.NavigateTo(_scheme + name + "/admin/site", true); NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
} }
private void Browse(string name) private void Browse(string name)
{ {
NavigationManager.NavigateTo(_scheme + name, true); NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
} }
} }

3
Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
View File

@ -42,8 +42,7 @@
{ {
if (_url != _mappedurl) if (_url != _mappedurl)
{ {
Uri uri = new Uri(NavigationManager.Uri); var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
var url = uri.Scheme + "://" + uri.Authority + "/";
url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : ""); url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url; _url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;

3
Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
View File

@ -64,8 +64,7 @@
{ {
try try
{ {
Uri uri = new Uri(NavigationManager.Uri); var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
var url = uri.Scheme + "://" + uri.Authority + "/";
url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : ""); url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid); var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);