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

permission updates

Browse Source
This commit is contained in:
Shaun Walker 2023-01-10 08:20:32 -05:00
parent ea463a6548
commit c2375c897d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Server/Controllers/SettingController.cs
View File

@ -229,7 +229,8 @@ namespace Oqtane.Controllers
authorized = true; authorized = true;
if (permissionName == PermissionNames.Edit) if (permissionName == PermissionNames.Edit)
{ {
authorized = User.IsInRole(RoleNames.Admin) || _userPermissions.IsAuthorized(User, _alias.SiteId, entityName, entityId, permissionName); authorized = _userPermissions.IsAuthorized(User, _alias.SiteId, entityName, entityId, permissionName) ||
_userPermissions.IsAuthorized(User, _alias.SiteId, entityName, -1, PermissionNames.Write, RoleNames.Admin);
} }
break; break;
} }

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

@ -97,6 +97,7 @@ namespace Oqtane.Repository
if (current.IsAuthorized != permission.IsAuthorized) if (current.IsAuthorized != permission.IsAuthorized)
{ {
current.IsAuthorized = permission.IsAuthorized; current.IsAuthorized = permission.IsAuthorized;
current.Role = null; // remove linked reference to Role which can cause errors in EF Core change tracking
_db.Entry(current).State = EntityState.Modified; _db.Entry(current).State = EntityState.Modified;
modified = true; modified = true;
} }