From 78adb24a758c54aafc708863df28140fc6afd026 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Thu, 9 Mar 2023 16:54:44 -0500
Subject: [PATCH] fix new installation issue

---
 Oqtane.Server/Repository/ModuleDefinitionRepository.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
index 165a39e7..55a93e2f 100644
--- a/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
+++ b/Oqtane.Server/Repository/ModuleDefinitionRepository.cs
@@ -81,7 +81,7 @@ namespace Oqtane.Repository
                     if (permissions.Count == 0)
                     {
                         // no module definition permissions exist for this site
-                        moduledefinition.PermissionList = ClonePermissions(moduledefinition.PermissionList);
+                        moduledefinition.PermissionList = ClonePermissions(siteId, moduledefinition.PermissionList);
                         _permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, moduledefinition.PermissionList);
                     }
                     else
@@ -93,7 +93,7 @@ namespace Oqtane.Repository
                         else
                         {
                             // permissions for module definition do not exist for this site
-                            moduledefinition.PermissionList = ClonePermissions(moduledefinition.PermissionList);
+                            moduledefinition.PermissionList = ClonePermissions(siteId, moduledefinition.PermissionList);
                             _permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, moduledefinition.PermissionList);
                         }
                     }
@@ -289,17 +289,18 @@ namespace Oqtane.Repository
             return moduledefinitions;
         }
 
-        private List<Permission> ClonePermissions(List<Permission> permissionList)
+        private List<Permission> ClonePermissions(int siteId, List<Permission> permissionList)
         {
             var permissions = new List<Permission>();
             foreach (var p in permissionList)
             {
                 var permission = new Permission();
-                permission.SiteId = p.SiteId;
+                permission.SiteId = siteId;
                 permission.EntityName = p.EntityName;
                 permission.EntityId = p.EntityId;
                 permission.PermissionName = p.PermissionName;
                 permission.RoleId = p.RoleId;
+                permission.Role = new Role { Name = p.Role.Name };
                 permission.UserId = p.UserId;
                 permission.IsAuthorized = p.IsAuthorized; 
                 permissions.Add(permission);