kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2840 from sbwalker/dev

Browse Source 
fix site provisioning issue for host module definitions
This commit is contained in:
Shaun Walker 2023-05-25 14:56:04 -04:00 committed by GitHub
commit 51d42692ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -358,12 +358,23 @@ namespace Oqtane.Repository
} }
if (moduledefinition.Categories == "Admin") if (moduledefinition.Categories == "Admin")
{
var shortName = moduledefinition.ModuleDefinitionName.Replace("Oqtane.Modules.Admin.", "").Replace(", Oqtane.Client", "");
if (Constants.DefaultHostModuleTypes.Contains(shortName))
{
moduledefinition.PermissionList = new List<Permission>
{
new Permission(PermissionNames.Utilize, RoleNames.Host, true)
};
}
else
{ {
moduledefinition.PermissionList = new List<Permission> moduledefinition.PermissionList = new List<Permission>
{ {
new Permission(PermissionNames.Utilize, RoleNames.Admin, true) new Permission(PermissionNames.Utilize, RoleNames.Admin, true)
}; };
} }
}
else else
{ {
moduledefinition.PermissionList = new List<Permission> moduledefinition.PermissionList = new List<Permission>

5
Oqtane.Shared/Shared/Constants.cs
View File

@ -1,4 +1,7 @@
using System; using System;
using Oqtane.Models;
using System.Collections.Generic;
using System.Runtime.InteropServices;
namespace Oqtane.Shared namespace Oqtane.Shared
{ {
@ -39,6 +42,8 @@ namespace Oqtane.Shared
public const string DefaultSiteTemplate = "Oqtane.SiteTemplates.DefaultSiteTemplate, Oqtane.Server"; public const string DefaultSiteTemplate = "Oqtane.SiteTemplates.DefaultSiteTemplate, Oqtane.Server";
public static readonly string[] DefaultHostModuleTypes = new[] { "Upgrade", "Themes", "SystemInfo", "Sql", "Sites", "ModuleDefinitions", "Logs", "Jobs", "ModuleCreator" };
public const string FileUrl = "/files/"; public const string FileUrl = "/files/";
public const string ImageUrl = "/api/file/image/"; public const string ImageUrl = "/api/file/image/";
public const int UserFolderCapacity = 20; // megabytes public const int UserFolderCapacity = 20; // megabytes