-
+
-
+
-
+
-
+
- @code {
- private string _title = "true";
- private string _background = "";
- private string _text = "";
- private string _border = "";
+@code {
+ private string resourceType = "Oqtane.Themes.OqtaneTheme.ContainerSettings, Oqtane.Client"; // for localization
+ private string _title = "true";
+ private string _background = "";
+ private string _text = "";
+ private string _border = "";
- protected override void OnInitialized()
+ protected override void OnInitialized()
+ {
+ try
{
- try
- {
- _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
- _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
- _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
- _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
- }
- catch (Exception ex)
- {
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
- }
+ _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
+ _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
+ _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
+ _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
}
-
- public async Task UpdateSettings()
+ catch (Exception ex)
{
- try
- {
- var settings = ModuleState.Settings;
- settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
- settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
- settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
- settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
- await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
- }
- catch (Exception ex)
- {
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
- }
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
}
}
+
+ public async Task UpdateSettings()
+ {
+ try
+ {
+ var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
+ await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+ }
+ catch (Exception ex)
+ {
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ }
+ }
+}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
index ecebce19..25f03f45 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
@@ -8,7 +8,7 @@
-
+
-
+
-
+
-
+
@code {
- private string _scope = "page";
- private string _login = "-";
- private string _register = "-";
- private string _footer = "-";
+ private string resourceType = "Oqtane.Themes.OqtaneTheme.ThemeSettings, Oqtane.Client"; // for localization
+ private string _scope = "page";
+ private string _login = "-";
+ private string _register = "-";
+ private string _footer = "-";
- protected override async Task OnInitializedAsync()
- {
- try
- {
- await LoadSettings();
+ protected override async Task OnInitializedAsync()
+ {
+ try
+ {
+ await LoadSettings();
}
catch (Exception ex)
{
@@ -110,7 +111,7 @@
{
if (_scope == "site")
{
- var settings = PageState.Site.Settings;
+ var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
if (_login != "-")
{
settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login, true);
@@ -127,7 +128,7 @@
}
else
{
- var settings = PageState.Page.Settings;
+ var settings = await SettingService.GetPageSettingsAsync(PageState.Page.PageId);
if (_login != "-")
{
settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);
diff --git a/Oqtane.Server/Controllers/ModuleController.cs b/Oqtane.Server/Controllers/ModuleController.cs
index cfcad970..100f30ad 100644
--- a/Oqtane.Server/Controllers/ModuleController.cs
+++ b/Oqtane.Server/Controllers/ModuleController.cs
@@ -75,7 +75,7 @@ namespace Oqtane.Controllers
module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
module.Settings = settings.Where(item => item.EntityId == pagemodule.ModuleId)
- .Where(item => item.IsPublic || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
+ .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, pagemodule.Module.Permissions))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
modules.Add(module);
@@ -102,7 +102,7 @@ namespace Oqtane.Controllers
List
moduledefinitions = _moduleDefinitions.GetModuleDefinitions(module.SiteId).ToList();
module.ModuleDefinition = moduledefinitions.Find(item => item.ModuleDefinitionName == module.ModuleDefinitionName);
module.Settings = _settings.GetSettings(EntityNames.Module, id)
- .Where(item => item.IsPublic || _userPermissions.IsAuthorized(User, PermissionNames.Edit, module.Permissions))
+ .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, module.Permissions))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
return module;
}
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index a0bf6213..5112924f 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -57,7 +57,7 @@ namespace Oqtane.Controllers
if (_userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
{
page.Settings = settings.Where(item => item.EntityId == page.PageId)
- .Where(item => item.IsPublic || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+ .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
pages.Add(page);
}
@@ -89,7 +89,7 @@ namespace Oqtane.Controllers
if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User,PermissionNames.View, page.Permissions))
{
page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
- .Where(item => item.IsPublic || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+ .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
return page;
}
@@ -109,7 +109,7 @@ namespace Oqtane.Controllers
if (page != null && page.SiteId == _alias.SiteId && _userPermissions.IsAuthorized(User, PermissionNames.View, page.Permissions))
{
page.Settings = _settings.GetSettings(EntityNames.Page, page.PageId)
- .Where(item => item.IsPublic || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
+ .Where(item => !item.IsPrivate || _userPermissions.IsAuthorized(User, PermissionNames.Edit, page.Permissions))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
return page;
}
diff --git a/Oqtane.Server/Controllers/SettingController.cs b/Oqtane.Server/Controllers/SettingController.cs
index 248342ab..6165a07e 100644
--- a/Oqtane.Server/Controllers/SettingController.cs
+++ b/Oqtane.Server/Controllers/SettingController.cs
@@ -41,9 +41,9 @@ namespace Oqtane.Controllers
if (IsAuthorized(entityName, entityId, PermissionNames.View))
{
settings = _settings.GetSettings(entityName, entityId).ToList();
- if (FilterPublic(entityName, entityId))
+ if (FilterPrivate(entityName, entityId))
{
- settings = settings.Where(item => item.IsPublic).ToList();
+ settings = settings.Where(item => !item.IsPrivate).ToList();
}
}
else
@@ -61,7 +61,7 @@ namespace Oqtane.Controllers
Setting setting = _settings.GetSetting(entityName, id);
if (IsAuthorized(setting.EntityName, setting.EntityId, PermissionNames.View))
{
- if (FilterPublic(entityName, id) && !setting.IsPublic)
+ if (FilterPrivate(entityName, id) && setting.IsPrivate)
{
setting = null;
}
@@ -199,7 +199,7 @@ namespace Oqtane.Controllers
return authorized;
}
- private bool FilterPublic(string entityName, int entityId)
+ private bool FilterPrivate(string entityName, int entityId)
{
bool filter = false;
switch (entityName)
diff --git a/Oqtane.Server/Controllers/SiteController.cs b/Oqtane.Server/Controllers/SiteController.cs
index 1ff066a8..9a50b91f 100644
--- a/Oqtane.Server/Controllers/SiteController.cs
+++ b/Oqtane.Server/Controllers/SiteController.cs
@@ -45,7 +45,7 @@ namespace Oqtane.Controllers
if (site.SiteId == _alias.SiteId)
{
site.Settings = _settings.GetSettings(EntityNames.Site, site.SiteId)
- .Where(item => item.IsPublic || User.IsInRole(RoleNames.Admin))
+ .Where(item => !item.IsPrivate || User.IsInRole(RoleNames.Admin))
.ToDictionary(setting => setting.SettingName, setting => setting.SettingValue);
return site;
}
diff --git a/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs b/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs
new file mode 100644
index 00000000..1d4f25c0
--- /dev/null
+++ b/Oqtane.Server/Migrations/Tenant/03000202_UpdateSettingIsPrivate.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Oqtane.Databases.Interfaces;
+using Oqtane.Migrations.EntityBuilders;
+using Oqtane.Repository;
+using Oqtane.Shared;
+
+namespace Oqtane.Migrations.Tenant
+{
+ [DbContext(typeof(TenantDBContext))]
+ [Migration("Tenant.03.00.02.02")]
+ public class UpdateSettingIsPrivate : MultiDatabaseMigration
+ {
+ public UpdateSettingIsPrivate(IDatabase database) : base(database)
+ {
+ }
+
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ var settingEntityBuilder = new SettingEntityBuilder(migrationBuilder, ActiveDatabase);
+ settingEntityBuilder.AddBooleanColumn("IsPrivate", true);
+ settingEntityBuilder.UpdateColumn("IsPrivate", "0", "bool", "");
+ settingEntityBuilder.UpdateColumn("IsPrivate", "1", "bool", "EntityName = 'Site' AND SettingName LIKE 'SMTP%'");
+ settingEntityBuilder.DropColumn("IsPublic");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ // not implemented
+ }
+ }
+}
diff --git a/Oqtane.Shared/Models/Setting.cs b/Oqtane.Shared/Models/Setting.cs
index 37d72dbe..4b3c66b0 100644
--- a/Oqtane.Shared/Models/Setting.cs
+++ b/Oqtane.Shared/Models/Setting.cs
@@ -33,9 +33,9 @@ namespace Oqtane.Models
public string SettingValue { get; set; }
///
- /// Indicates if this setting is publicly available - only applicable to Site Settings as other entities have more granular permissions
+ /// Indicates if this setting is private - indicating it should be maintained on the server and not sent to the client
///
- public bool IsPublic { get; set; }
+ public bool IsPrivate { get; set; }
#region IAuditable Properties
diff --git a/Oqtane.Shared/Shared/Utilities.cs b/Oqtane.Shared/Shared/Utilities.cs
index b1313a7a..89b33341 100644
--- a/Oqtane.Shared/Shared/Utilities.cs
+++ b/Oqtane.Shared/Shared/Utilities.cs
@@ -1,7 +1,6 @@
using Oqtane.Models;
using System;
using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -107,7 +106,7 @@ namespace Oqtane.Shared
public static string ContentUrl(Alias alias, int fileId, bool asAttachment)
{
var aliasUrl = (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path : "";
- var method = asAttachment ? "/attach":"";
+ var method = asAttachment ? "/attach" : "";
return $"{aliasUrl}{Constants.ContentUrl}{fileId}{method}";
}
@@ -128,7 +127,7 @@ namespace Oqtane.Shared
public static string TenantUrl(Alias alias, string url)
{
- url = (!url.StartsWith("/")) ? "/" + url : url;
+ url = (!url.StartsWith("/")) ? "/" + url : url;
return (alias != null && !string.IsNullOrEmpty(alias.Path)) ? "/" + alias.Path + url : url;
}