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

Merge remote-tracking branch 'oqtane/dev' into dev

Browse Source
This commit is contained in:
Leigh Pointer 2023-04-13 13:27:33 +02:00
commit f8c1fde358
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Oqtane.Client/UI/Pane.razor
View File

@ -58,7 +58,11 @@ else
} }
if (Name.ToLower() == pane.ToLower()) if (Name.ToLower() == pane.ToLower())
{ {
Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId);
if (module == null)
{
module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
}
if (module != null) if (module != null)
{ {
var moduleType = Type.GetType(module.ModuleType); var moduleType = Type.GetType(module.ModuleType);
@ -107,7 +111,11 @@ else
{ {
if (PageState.ModuleId != -1) if (PageState.ModuleId != -1)
{ {
Module module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId); Module module = PageState.Modules.FirstOrDefault(item => item.PageId == PageState.Page.PageId && item.ModuleId == PageState.ModuleId);
if (module == null)
{
module = PageState.Modules.FirstOrDefault(item => item.ModuleId == PageState.ModuleId);
}
if (module != null && module.Pane.ToLower() == Name.ToLower()) if (module != null && module.Pane.ToLower() == Name.ToLower())
{ {
// check if user is authorized to view module // check if user is authorized to view module

3
Oqtane.Server/Repository/PermissionRepository.cs
View File

@ -36,9 +36,10 @@ namespace Oqtane.Repository
{ {
if (permission.RoleId != null && string.IsNullOrEmpty(permission.RoleName)) if (permission.RoleId != null && string.IsNullOrEmpty(permission.RoleName))
{ {
permission.RoleName = roles.Find(item => item.RoleId == permission.RoleId).Name; permission.RoleName = roles.Find(item => item.RoleId == permission.RoleId)?.Name;
} }
} }
permissions = permissions.Where(item => item.UserId != null || item.RoleName != null).ToList();
entry.SlidingExpiration = TimeSpan.FromMinutes(30); entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return permissions; return permissions;
}); });