ability to specify Resources in IModule and ITheme interfaces,, fixed module settings for personalized pages
This commit is contained in:
@ -21,6 +21,7 @@ namespace Oqtane.Controllers
|
||||
{
|
||||
private readonly ISiteRepository _sites;
|
||||
private readonly IPageRepository _pages;
|
||||
private readonly IThemeRepository _themes;
|
||||
private readonly IModuleRepository _modules;
|
||||
private readonly IPageModuleRepository _pageModules;
|
||||
private readonly IModuleDefinitionRepository _moduleDefinitions;
|
||||
@ -32,10 +33,11 @@ namespace Oqtane.Controllers
|
||||
private readonly IMemoryCache _cache;
|
||||
private readonly Alias _alias;
|
||||
|
||||
public SiteController(ISiteRepository sites, IPageRepository pages, IModuleRepository modules, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, ILanguageRepository languages, IUserPermissions userPermissions, ISettingRepository settings, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger, IMemoryCache cache)
|
||||
public SiteController(ISiteRepository sites, IPageRepository pages, IThemeRepository themes, IModuleRepository modules, IPageModuleRepository pageModules, IModuleDefinitionRepository moduleDefinitions, ILanguageRepository languages, IUserPermissions userPermissions, ISettingRepository settings, ITenantManager tenantManager, ISyncManager syncManager, ILogManager logger, IMemoryCache cache)
|
||||
{
|
||||
_sites = sites;
|
||||
_pages = pages;
|
||||
_themes = themes;
|
||||
_modules = modules;
|
||||
_pageModules = pageModules;
|
||||
_moduleDefinitions = moduleDefinitions;
|
||||
@ -144,6 +146,9 @@ namespace Oqtane.Controllers
|
||||
var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
|
||||
site.Languages.Add(new Language { Code = defaultCulture.Name, Name = defaultCulture.DisplayName, Version = Constants.Version, IsDefault = !site.Languages.Any(l => l.IsDefault) });
|
||||
|
||||
// themes
|
||||
site.Themes = _themes.FilterThemes(_themes.GetThemes().ToList());
|
||||
|
||||
return site;
|
||||
}
|
||||
else
|
||||
|
@ -6,6 +6,7 @@ namespace Oqtane.Repository
|
||||
public interface IThemeRepository
|
||||
{
|
||||
IEnumerable<Theme> GetThemes();
|
||||
List<Theme> FilterThemes(List<Theme> themes);
|
||||
void DeleteTheme(string ThemeName);
|
||||
}
|
||||
}
|
||||
|
@ -79,6 +79,7 @@ namespace Oqtane.Repository
|
||||
ModuleDefinition.SettingsType = moduleDefinition.SettingsType;
|
||||
ModuleDefinition.ControlTypeTemplate = moduleDefinition.ControlTypeTemplate;
|
||||
ModuleDefinition.IsPortable = moduleDefinition.IsPortable;
|
||||
ModuleDefinition.Resources = moduleDefinition.Resources;
|
||||
}
|
||||
|
||||
return ModuleDefinition;
|
||||
|
@ -144,6 +144,24 @@ namespace Oqtane.Repository
|
||||
return themes;
|
||||
}
|
||||
|
||||
public List<Theme> FilterThemes(List<Theme> themes)
|
||||
{
|
||||
var Themes = new List<Theme>();
|
||||
|
||||
foreach (Theme theme in themes)
|
||||
{
|
||||
var Theme = new Theme();
|
||||
Theme.ThemeName = theme.ThemeName;
|
||||
Theme.Name = theme.Name;
|
||||
Theme.Resources = theme.Resources;
|
||||
Theme.Themes = theme.Themes;
|
||||
Theme.Containers = theme.Containers;
|
||||
Themes.Add(Theme);
|
||||
}
|
||||
|
||||
return Themes;
|
||||
}
|
||||
|
||||
public void DeleteTheme(string ThemeName)
|
||||
{
|
||||
_cache.Remove("themes");
|
||||
|
Reference in New Issue
Block a user