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

improvements for site groups

Browse Source
This commit is contained in:
sbwalker
2026-02-06 11:53:10 -05:00
parent dff2261994
commit 57deeb6acf
12 changed files with 131 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Oqtane.Server/Controllers/SiteGroupDefinitionController.cs
View File

@@ -1,13 +1,14 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Authorization;
using Oqtane.Enums;
using Oqtane.Models;
using Oqtane.Shared;
using Oqtane.Infrastructure;
using Oqtane.Repository;
using System.Net;
using System.Linq;
using System.Net;
using System.Security.Policy;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Oqtane.Enums;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Repository;
using Oqtane.Shared;
namespace Oqtane.Controllers
{
@@ -27,12 +28,26 @@ namespace Oqtane.Controllers
_alias = tenantManager.GetAlias();
}
// GET: api/<controller>
// GET: api/<controller>?siteid=x
[HttpGet]
[Authorize(Roles = RoleNames.Host)]
public IEnumerable<SiteGroupDefinition> Get()
[Authorize(Roles = RoleNames.Admin)]
public IEnumerable<SiteGroupDefinition> Get(string siteid)
{
return _siteGroupDefinitionRepository.GetSiteGroupDefinitions().ToList();
if (User.IsInRole(RoleNames.Host) || (int.TryParse(siteid, out int SiteId) && SiteId == _alias.SiteId))
{
var siteGroupDefinitions = _siteGroupDefinitionRepository.GetSiteGroupDefinitions();
if (!User.IsInRole(RoleNames.Host))
{
siteGroupDefinitions = siteGroupDefinitions.Where(item => item.PrimarySiteId == _alias.SiteId);
}
return siteGroupDefinitions.ToList();
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized Site Group Definition Get Attempt {SiteId}", siteid);
HttpContext.Response.StatusCode = (int)HttpStatusCode.Forbidden;
return null;
}
}
// GET api/<controller>/5
@@ -74,11 +89,17 @@ namespace Oqtane.Controllers
// PUT api/<controller>/5
[HttpPut("{id}")]
[Authorize(Roles = RoleNames.Host)]
[Authorize(Roles = RoleNames.Admin)]
public SiteGroupDefinition Put(int id, [FromBody] SiteGroupDefinition siteGroupDefinition)
{
if (ModelState.IsValid && siteGroupDefinition.SiteGroupDefinitionId == id && _siteGroupDefinitionRepository.GetSiteGroupDefinition(siteGroupDefinition.SiteGroupDefinitionId, false) != null)
if (ModelState.IsValid && siteGroupDefinition.SiteGroupDefinitionId == id)
{
if (!User.IsInRole(RoleNames.Host) && siteGroupDefinition.Synchronize)
{
// admins can only update the synchronize field
siteGroupDefinition = _siteGroupDefinitionRepository.GetSiteGroupDefinition(siteGroupDefinition.SiteGroupDefinitionId, false);
siteGroupDefinition.Synchronize = true;
}
siteGroupDefinition = _siteGroupDefinitionRepository.UpdateSiteGroupDefinition(siteGroupDefinition);
_syncManager.AddSyncEvent(_alias, EntityNames.SiteGroupDefinition, siteGroupDefinition.SiteGroupDefinitionId, SyncEventActions.Update);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "Site Group Definition Updated {Group}", siteGroupDefinition);

7
Oqtane.Server/Infrastructure/Jobs/SynchronizationJob.cs
View File

@@ -89,6 +89,10 @@ namespace Oqtane.Infrastructure
{
siteGroup.SynchronizedOn = DateTime.MinValue;
}
if (siteGroup.SiteGroupDefinition.Localization)
{
siteGroup.Synchronize = false; // when using localization, do not overwrite content
}
// replicate site
var siteLog = ReplicateSite(provider, tenantManager, settingRepository, siteGroup, primarySite, secondarySite);
@@ -136,6 +140,7 @@ namespace Oqtane.Infrastructure
if (primarySite.ModifiedOn > siteGroup.SynchronizedOn)
{
secondarySite.TimeZoneId = primarySite.TimeZoneId;
secondarySite.CultureCode = primarySite.CultureCode;
if (secondarySite.LogoFileId != primarySite.LogoFileId)
{
secondarySite.LogoFileId = ResolveFileId(provider, primarySite.LogoFileId, secondarySite.SiteId);
@@ -181,7 +186,7 @@ namespace Oqtane.Infrastructure
{
siteRepository.UpdateSite(secondarySite);
}
log += Log(siteGroup, $"Secondary Site Updated: {secondarySite.Name}");
log += Log(siteGroup, $"Site Updated: {secondarySite.Name}");
}
// site settings

11
Oqtane.Server/Services/SiteService.cs
View File

@@ -318,6 +318,7 @@ namespace Oqtane.Services
var siteGroups = _siteGroups.GetSiteGroups();
if (siteGroups.Any(item => item.SiteId == siteId && item.SiteGroupDefinition.Localization))
{
// site is part of a localized site group - get all languages from the site group
var sites = _sites.GetSites().ToList();
var aliases = _aliases.GetAliases().ToList();
@@ -340,6 +341,16 @@ namespace Oqtane.Services
}
}
}
else
{
// use site languages
languages = _languages.GetLanguages(siteId).ToList();
var defaultCulture = CultureInfo.GetCultureInfo(Constants.DefaultCulture);
if (!languages.Exists(item => item.Code == defaultCulture.Name))
{
languages.Add(new Language { Code = defaultCulture.Name, Name = "", Version = Constants.Version, IsDefault = !languages.Any(l => l.IsDefault) });
}
}
return languages;
}