Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #4628 - preserve ReturnUrl when navigating to Settings component #4629

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Oqtane.Client/Themes/Controls/Container/ModuleActionsBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,11 @@ private async Task<string> DeleteModule(string url, PageModule pagemodule)
return url;
}

private async Task<string> Settings(string url, PageModule pagemodule)
private Task<string> Settings(string url, PageModule pagemodule)
{
await Task.Yield();
var returnurl = Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, "edit=true");
var returnurl = NavigationManager.Uri.Substring(NavigationManager.BaseUri.Length - 1);
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)
Expand Down