kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4629 from sbwalker/dev

Browse Source 
fix #4628 - preserve ReturnUrl when navigating to Settings component
This commit is contained in:
Shaun Walker 2024-09-18 09:43:11 -04:00 committed by GitHub
commit 10f38a72f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
View File

@ -134,12 +134,11 @@ namespace Oqtane.Themes.Controls
return url; return url;
} }
private async Task<string> Settings(string url, PageModule pagemodule) private Task<string> Settings(string url, PageModule pagemodule)
{ {
await Task.Yield(); var returnurl = NavigationManager.Uri.Substring(NavigationManager.BaseUri.Length - 1);
var returnurl = Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, "edit=true");
url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, pagemodule.ModuleId, "Settings", "returnurl=" + WebUtility.UrlEncode(returnurl)); url = Utilities.EditUrl(PageState.Alias.Path, PageState.Page.Path, pagemodule.ModuleId, "Settings", "returnurl=" + WebUtility.UrlEncode(returnurl));
return url; return Task.FromResult(url);
} }
private async Task<string> Publish(string url, PageModule pagemodule) private async Task<string> Publish(string url, PageModule pagemodule)