Merge pull request #1886 from sbwalker/dev

imrove custom entity support in settings
This commit is contained in:
Shaun Walker 2021-12-20 07:49:10 -05:00 committed by GitHub
commit bd8d6e0480
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -188,7 +188,7 @@ namespace Oqtane.Controllers
default: // custom entity
if (permissionName == PermissionNames.Edit)
{
authorized = User.IsInRole(RoleNames.Admin);
authorized = User.IsInRole(RoleNames.Admin) || _userPermissions.IsAuthorized(User, entityName, entityId, permissionName);
}
else
{
@ -231,7 +231,7 @@ namespace Oqtane.Controllers
}
break;
default: // custom entity
filter = !User.IsInRole(RoleNames.Admin);
filter = !User.IsInRole(RoleNames.Admin) && !_userPermissions.IsAuthorized(User, entityName, entityId, PermissionNames.Edit);
break;
}
return filter;