Merge pull request #4291 from sbwalker/dev

introduce Clone method in Permission model
This commit is contained in:
Shaun Walker 2024-05-28 07:56:01 -04:00 committed by GitHub
commit b282a2a621
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions

View File

@ -491,18 +491,8 @@ namespace Oqtane.Repository
pageModule.Module.PermissionList = new List<Permission>(); pageModule.Module.PermissionList = new List<Permission>();
foreach (var permission in pageTemplateModule.PermissionList) foreach (var permission in pageTemplateModule.PermissionList)
{ {
pageModule.Module.PermissionList.Add(new Permission pageModule.Module.PermissionList.Add(permission.Clone(permission));
{
SiteId = permission.SiteId,
EntityName = permission.EntityName,
EntityId = permission.EntityId,
PermissionName = permission.PermissionName,
RoleName = permission.RoleName,
UserId = permission.UserId,
IsAuthorized = permission.IsAuthorized
});
} }
//pageModule.Module.PermissionList = pageTemplateModule.PermissionList;
pageModule.Module.AllPages = false; pageModule.Module.AllPages = false;
pageModule.Module.IsDeleted = false; pageModule.Module.IsDeleted = false;
try try

View File

@ -101,6 +101,20 @@ namespace Oqtane.Models
IsAuthorized = isAuthorized; IsAuthorized = isAuthorized;
} }
public Permission Clone(Permission permission)
{
return new Permission
{
SiteId = permission.SiteId,
EntityName = permission.EntityName,
EntityId = permission.EntityId,
PermissionName = permission.PermissionName,
RoleName = permission.RoleName,
UserId = permission.UserId,
IsAuthorized = permission.IsAuthorized
};
}
[Obsolete("The Role property is deprecated", false)] [Obsolete("The Role property is deprecated", false)]
[NotMapped] [NotMapped]
[JsonIgnore] // exclude from API payload [JsonIgnore] // exclude from API payload