Merge pull request #4291 from sbwalker/dev

introduce Clone method in Permission model
oqtane · May 28, 2024 · b282a2a · b282a2a
2 parents 52fd030 + 9a7a534
commit b282a2a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
@@ -491,18 +491,8 @@ public void CreatePages(Site site, List<PageTemplate> pageTemplates, Alias alias
                                 pageModule.Module.PermissionList = new List<Permission>();
                                 foreach (var permission in pageTemplateModule.PermissionList)
                                 {
-                                    pageModule.Module.PermissionList.Add(new 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.Add(permission.Clone(permission));
                                 }
-                                //pageModule.Module.PermissionList = pageTemplateModule.PermissionList;
                                 pageModule.Module.AllPages = false;
                                 pageModule.Module.IsDeleted = false;
                                 try

diff --git a/Oqtane.Shared/Models/Permission.cs b/Oqtane.Shared/Models/Permission.cs
@@ -101,6 +101,20 @@ private void Initialize(int siteId, string entityName, int entityId, string perm
             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)]
         [NotMapped]
         [JsonIgnore] // exclude from API payload