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

View File

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