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

Merge pull request #2731 from sbwalker/dev

Browse Source 
fix #2720 - module definition permissions not being created properly for new sites
This commit is contained in:
Shaun Walker 2023-04-05 10:27:44 -04:00 committed by GitHub
commit 648edcabba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -322,10 +322,10 @@ namespace Oqtane.Repository
permission.EntityName = p.EntityName;
permission.EntityId = p.EntityId;
permission.PermissionName = p.PermissionName;
permission.RoleId = p.RoleId;
permission.RoleId = null;
permission.RoleName = p.RoleName;
permission.UserId = p.UserId;
permission.IsAuthorized = p.IsAuthorized;
permission.IsAuthorized = p.IsAuthorized;
permissions.Add(permission);
}
return permissions;

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

@ -93,11 +93,7 @@ namespace Oqtane.Repository
permission.EntityId = (permission.EntityName == entityName) ? entityId : -1;
if (permission.UserId == null && permission.RoleId == null && !string.IsNullOrEmpty(permission.RoleName))
{
var role = roles.FirstOrDefault(item => item.Name == permission.RoleName);
if (role != null)
{
permission.RoleId = role.RoleId;
}
permission.RoleId = roles.FirstOrDefault(item => item.Name == permission.RoleName)?.RoleId;
}
}
// add or update permissions