fix new installation issue
This commit is contained in:
parent
af3b289331
commit
78adb24a75
|
@ -81,7 +81,7 @@ namespace Oqtane.Repository
|
||||||
if (permissions.Count == 0)
|
if (permissions.Count == 0)
|
||||||
{
|
{
|
||||||
// no module definition permissions exist for this site
|
// 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);
|
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, moduledefinition.PermissionList);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -93,7 +93,7 @@ namespace Oqtane.Repository
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// permissions for module definition do not exist for this site
|
// 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);
|
_permissions.UpdatePermissions(siteId, EntityNames.ModuleDefinition, moduledefinition.ModuleDefinitionId, moduledefinition.PermissionList);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -289,17 +289,18 @@ namespace Oqtane.Repository
|
||||||
return moduledefinitions;
|
return moduledefinitions;
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Permission> ClonePermissions(List<Permission> permissionList)
|
private List<Permission> ClonePermissions(int siteId, List<Permission> permissionList)
|
||||||
{
|
{
|
||||||
var permissions = new List<Permission>();
|
var permissions = new List<Permission>();
|
||||||
foreach (var p in permissionList)
|
foreach (var p in permissionList)
|
||||||
{
|
{
|
||||||
var permission = new Permission();
|
var permission = new Permission();
|
||||||
permission.SiteId = p.SiteId;
|
permission.SiteId = siteId;
|
||||||
permission.EntityName = p.EntityName;
|
permission.EntityName = p.EntityName;
|
||||||
permission.EntityId = p.EntityId;
|
permission.EntityId = p.EntityId;
|
||||||
permission.PermissionName = p.PermissionName;
|
permission.PermissionName = p.PermissionName;
|
||||||
permission.RoleId = p.RoleId;
|
permission.RoleId = p.RoleId;
|
||||||
|
permission.Role = new Role { Name = p.Role.Name };
|
||||||
permission.UserId = p.UserId;
|
permission.UserId = p.UserId;
|
||||||
permission.IsAuthorized = p.IsAuthorized;
|
permission.IsAuthorized = p.IsAuthorized;
|
||||||
permissions.Add(permission);
|
permissions.Add(permission);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user