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

Merge pull request #4991 from sbwalker/dev

Browse Source 
fix #4984 - redirect not working for personalized pages
This commit is contained in:
Shaun Walker 2025-01-15 11:57:00 -05:00 committed by GitHub
commit e842bd882a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
View File

@ -131,6 +131,7 @@
if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)) if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
{ {
page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId); page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId);
PageState.EditMode = true;
} }
if (_showEditMode) if (_showEditMode)
@ -153,7 +154,7 @@
{ {
if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)) if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))
{ {
NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + PageState.EditMode.ToString())); NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + PageState.EditMode.ToString().ToLower()));
} }
} }
} }

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

@ -244,7 +244,7 @@
// look for personalized page // look for personalized page
if (user != null && page.IsPersonalizable && !UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)) if (user != null && page.IsPersonalizable && !UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList))
{ {
var personalized = await PageService.GetPageAsync(route.PagePath + "/" + user.Username, site.SiteId); var personalized = await PageService.GetPageAsync(route.PagePath + "/" + Utilities.GetFriendlyUrl(user.Username), site.SiteId);
if (personalized != null) if (personalized != null)
{ {
// redirect to the personalized page // redirect to the personalized page