Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

resolve issue with host setting overrides

Browse Source
This commit is contained in:
sbwalker
2025-04-30 13:46:52 -04:00
parent dc926bf838
commit 753ab3bdd7
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
View File

@ -40,7 +40,7 @@ namespace Oqtane.Infrastructure
log += "Processing Notifications For Site: " + site.Name + "<br />";
// get site settings
List<Setting> sitesettings = settingRepository.GetSettings(EntityNames.Site, site.SiteId).ToList();
List<Setting> sitesettings = settingRepository.GetSettings(EntityNames.Site, site.SiteId, EntityNames.Host, -1).ToList();
Dictionary<string, string> settings = GetSettings(sitesettings);
if (!site.IsDeleted && (!settings.ContainsKey("SMTPEnabled") || settings["SMTPEnabled"] == "True"))
{

2
Oqtane.Server/Infrastructure/Middleware/TenantMiddleware.cs
View File

@ -39,7 +39,7 @@ namespace Oqtane.Infrastructure
var sitesettings = cache.GetOrCreate(Constants.HttpContextSiteSettingsKey + alias.SiteKey, entry =>
{
var settingRepository = context.RequestServices.GetService(typeof(ISettingRepository)) as ISettingRepository;
return settingRepository.GetSettings(EntityNames.Site, alias.SiteId)
return settingRepository.GetSettings(EntityNames.Site, alias.SiteId, EntityNames.Host, -1)
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
});
context.Items.Add(Constants.HttpContextSiteSettingsKey, sitesettings);