diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index a3133216..9798c2f9 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -14,10 +14,16 @@ @if (_containers != null) {
+
+ +
+ +
+
- +
@@ -104,6 +110,7 @@ private ElementReference form; private bool validated = false; private List _containers = new List(); + private string _module; private string _title; private string _containerType; private string _allPages = "false"; @@ -125,6 +132,7 @@ protected override void OnInitialized() { + _module = ModuleState.ModuleDefinition.Name; _title = ModuleState.Title; _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType); _containerType = ModuleState.ContainerType; diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs index 8023da67..f1a086e5 100644 --- a/Oqtane.Client/Modules/ModuleBase.cs +++ b/Oqtane.Client/Modules/ModuleBase.cs @@ -9,7 +9,6 @@ using Oqtane.UI; using System.Collections.Generic; using Microsoft.JSInterop; using System.Linq; -using Oqtane.Themes; namespace Oqtane.Modules { diff --git a/Oqtane.Client/Oqtane.Client.csproj b/Oqtane.Client/Oqtane.Client.csproj index 19f19354..ae3e2589 100644 --- a/Oqtane.Client/Oqtane.Client.csproj +++ b/Oqtane.Client/Oqtane.Client.csproj @@ -4,7 +4,7 @@ net7.0 Exe Debug;Release - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -12,7 +12,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git Oqtane diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx index 7cd012dd..db947070 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx @@ -150,4 +150,10 @@ A Problem Was Encountered Loading Module {0}. The Module Is Either Invalid Or Does Not Exist. + + The name of the module + + + Module: + \ No newline at end of file diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor index 4c3f9f0c..d35268a2 100644 --- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor +++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor @@ -36,7 +36,7 @@ @if (_canViewAdminDashboard || UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList)) { - @@ -471,6 +471,12 @@ private async Task ToggleEditMode(bool EditMode) { + Page page = null; + if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)) + { + page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId); + } + if (_showEditMode) { if (EditMode) @@ -490,9 +496,8 @@ } else { - if (PageState.Page.IsPersonalizable && PageState.User != null) + if (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)) { - var page = await PageService.AddPageAsync(PageState.Page.PageId, PageState.User.UserId); PageState.EditMode = true; NavigationManager.NavigateTo(NavigateUrl(page.Path, "edit=" + ((PageState.EditMode) ? "true" : "false"))); } diff --git a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs index 9f4f4071..468e398e 100644 --- a/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs +++ b/Oqtane.Client/Themes/Controls/Theme/LoginBase.cs @@ -19,7 +19,6 @@ namespace Oqtane.Themes.Controls [Inject] public IUserService UserService { get; set; } [Inject] public IJSRuntime jsRuntime { get; set; } [Inject] public IServiceProvider ServiceProvider { get; set; } - [Inject] public ILogService LoggingService { get; set; } protected void LoginUser() { diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs index 8fcb1a30..2de61b1c 100644 --- a/Oqtane.Client/Themes/ThemeBase.cs +++ b/Oqtane.Client/Themes/ThemeBase.cs @@ -1,6 +1,9 @@ using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using Oqtane.Enums; using Oqtane.Models; +using Oqtane.Modules; +using Oqtane.Services; using Oqtane.Shared; using Oqtane.UI; using System; @@ -13,6 +16,9 @@ namespace Oqtane.Themes { public abstract class ThemeBase : ComponentBase, IThemeControl { + [Inject] + protected ILogService LoggingService { get; set; } + [Inject] protected IJSRuntime JSRuntime { get; set; } @@ -186,6 +192,148 @@ namespace Oqtane.Themes await interop.ScrollTo(0, 0, "smooth"); } + // logging methods + public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args) + { + LogFunction logFunction; + if (string.IsNullOrEmpty(function)) + { + // try to infer from page action + function = PageState.Action; + } + if (!Enum.TryParse(function, out logFunction)) + { + switch (function.ToLower()) + { + case "add": + logFunction = LogFunction.Create; + break; + case "edit": + logFunction = LogFunction.Update; + break; + case "delete": + logFunction = LogFunction.Delete; + break; + case "": + logFunction = LogFunction.Read; + break; + default: + logFunction = LogFunction.Other; + break; + } + } + await Log(alias, level, logFunction, exception, message, args); + } + + public async Task Log(Alias alias, LogLevel level, LogFunction function, Exception exception, string message, params object[] args) + { + int pageId = PageState.Page.PageId; + string category = GetType().AssemblyQualifiedName; + string feature = Utilities.GetTypeNameLastSegment(category, 1); + + await LoggingService.Log(alias, pageId, null, PageState.User?.UserId, category, feature, function, level, exception, message, args); + } + + public class Logger + { + private readonly ModuleBase _moduleBase; + + public Logger(ModuleBase moduleBase) + { + _moduleBase = moduleBase; + } + + public async Task LogTrace(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Trace, "", null, message, args); + } + + public async Task LogTrace(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Trace, function, null, message, args); + } + + public async Task LogTrace(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Trace, "", exception, message, args); + } + + public async Task LogDebug(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Debug, "", null, message, args); + } + + public async Task LogDebug(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Debug, function, null, message, args); + } + + public async Task LogDebug(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Debug, "", exception, message, args); + } + + public async Task LogInformation(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Information, "", null, message, args); + } + + public async Task LogInformation(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Information, function, null, message, args); + } + + public async Task LogInformation(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Information, "", exception, message, args); + } + + public async Task LogWarning(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Warning, "", null, message, args); + } + + public async Task LogWarning(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Warning, function, null, message, args); + } + + public async Task LogWarning(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Warning, "", exception, message, args); + } + + public async Task LogError(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Error, "", null, message, args); + } + + public async Task LogError(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Error, function, null, message, args); + } + + public async Task LogError(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Error, "", exception, message, args); + } + + public async Task LogCritical(string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Critical, "", null, message, args); + } + + public async Task LogCritical(LogFunction function, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Critical, function, null, message, args); + } + + public async Task LogCritical(Exception exception, string message, params object[] args) + { + await _moduleBase.Log(null, LogLevel.Critical, "", exception, message, args); + } + } + [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)] public string ContentUrl(int fileid) { diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor index cd3a1764..e1224b16 100644 --- a/Oqtane.Client/UI/SiteRouter.razor +++ b/Oqtane.Client/UI/SiteRouter.razor @@ -223,12 +223,12 @@ } if (page == null) { - // look for personalized page page = await PageService.GetPageAsync(route.PagePath, site.SiteId); } else { - if (user != null && page.IsPersonalizable) + // look for personalized page + if (user != null && page.IsPersonalizable && !UserSecurity.IsAuthorized(user, PermissionNames.Edit, page.PermissionList)) { var personalized = await PageService.GetPageAsync(route.PagePath + "/" + user.Username, site.SiteId); if (personalized != null) diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj index 516a19b1..d193711f 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj @@ -2,7 +2,7 @@ net7.0 - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git true diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec index 93c7397f..1a370623 100644 --- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec +++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.MySQL - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane MySQL Provider @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj index 766bb3ca..c5231e7f 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.csproj @@ -2,7 +2,7 @@ net7.0 - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git true diff --git a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec index dabb9c07..5f2636f9 100644 --- a/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec +++ b/Oqtane.Database.PostgreSQL/Oqtane.Database.PostgreSQL.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.PostgreSQL - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane PostgreSQL Provider @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj index a5f1eff0..a70171ba 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.csproj @@ -2,7 +2,7 @@ net7.0 - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git true diff --git a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec index 7a021d25..566e1ed0 100644 --- a/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec +++ b/Oqtane.Database.SqlServer/Oqtane.Database.SqlServer.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.SqlServer - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane SQL Server Provider @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj index a14adef3..9e0b7793 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.csproj @@ -2,7 +2,7 @@ net7.0 - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -10,7 +10,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git true diff --git a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec index 9a36be5b..c77f1cc7 100644 --- a/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec +++ b/Oqtane.Database.Sqlite/Oqtane.Database.Sqlite.nuspec @@ -2,7 +2,7 @@ Oqtane.Database.Sqlite - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane SQLite Provider @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Maui/Oqtane.Maui.csproj b/Oqtane.Maui/Oqtane.Maui.csproj index 1f9d42e8..8974e6bb 100644 --- a/Oqtane.Maui/Oqtane.Maui.csproj +++ b/Oqtane.Maui/Oqtane.Maui.csproj @@ -6,7 +6,7 @@ Exe - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -14,7 +14,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git Oqtane.Maui @@ -31,7 +31,7 @@ 0E29FC31-1B83-48ED-B6E0-9F3C67B775D4 - 4.0.0 + 4.0.1 1 14.2 diff --git a/Oqtane.Package/Oqtane.Client.nuspec b/Oqtane.Package/Oqtane.Client.nuspec index b2b4def4..752a2449 100644 --- a/Oqtane.Package/Oqtane.Client.nuspec +++ b/Oqtane.Package/Oqtane.Client.nuspec @@ -2,7 +2,7 @@ Oqtane.Client - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Framework.nuspec b/Oqtane.Package/Oqtane.Framework.nuspec index 662219e6..5c5ad632 100644 --- a/Oqtane.Package/Oqtane.Framework.nuspec +++ b/Oqtane.Package/Oqtane.Framework.nuspec @@ -2,7 +2,7 @@ Oqtane.Framework - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane Framework @@ -11,8 +11,8 @@ .NET Foundation false MIT - https://github.com/oqtane/oqtane.framework/releases/download/v4.0.0/Oqtane.Framework.4.0.0.Upgrade.zip - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/download/v4.0.1/Oqtane.Framework.4.0.1.Upgrade.zip + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane framework diff --git a/Oqtane.Package/Oqtane.Server.nuspec b/Oqtane.Package/Oqtane.Server.nuspec index 70a25469..94fe9ab5 100644 --- a/Oqtane.Package/Oqtane.Server.nuspec +++ b/Oqtane.Package/Oqtane.Server.nuspec @@ -2,7 +2,7 @@ Oqtane.Server - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Shared.nuspec b/Oqtane.Package/Oqtane.Shared.nuspec index 6b073a4a..f4170745 100644 --- a/Oqtane.Package/Oqtane.Shared.nuspec +++ b/Oqtane.Package/Oqtane.Shared.nuspec @@ -2,7 +2,7 @@ Oqtane.Shared - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Package/Oqtane.Updater.nuspec b/Oqtane.Package/Oqtane.Updater.nuspec index 9e667cc9..622e8109 100644 --- a/Oqtane.Package/Oqtane.Updater.nuspec +++ b/Oqtane.Package/Oqtane.Updater.nuspec @@ -2,7 +2,7 @@ Oqtane.Updater - 4.0.0 + 4.0.1 Shaun Walker .NET Foundation Oqtane Framework @@ -12,7 +12,7 @@ false MIT https://github.com/oqtane/oqtane.framework - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 icon.png oqtane diff --git a/Oqtane.Package/install.ps1 b/Oqtane.Package/install.ps1 index 9d1c4f9e..8f8c07ad 100644 --- a/Oqtane.Package/install.ps1 +++ b/Oqtane.Package/install.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Install.zip" -Force \ No newline at end of file +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.1.Install.zip" -Force \ No newline at end of file diff --git a/Oqtane.Package/upgrade.ps1 b/Oqtane.Package/upgrade.ps1 index 17d5c251..0c20267b 100644 --- a/Oqtane.Package/upgrade.ps1 +++ b/Oqtane.Package/upgrade.ps1 @@ -1 +1 @@ -Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.0.Upgrade.zip" -Force \ No newline at end of file +Compress-Archive -Path "..\Oqtane.Server\bin\Release\net7.0\publish\*" -DestinationPath "Oqtane.Framework.4.0.1.Upgrade.zip" -Force \ No newline at end of file diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs index e6adba2f..1cb3eee0 100644 --- a/Oqtane.Server/Controllers/PageController.cs +++ b/Oqtane.Server/Controllers/PageController.cs @@ -9,6 +9,7 @@ using System.Net; using Oqtane.Enums; using Oqtane.Infrastructure; using Oqtane.Repository; +using System.IO; namespace Oqtane.Controllers { @@ -177,64 +178,68 @@ namespace Oqtane.Controllers User user = _userPermissions.GetUser(User); if (parent != null && parent.SiteId == _alias.SiteId && parent.IsPersonalizable && user.UserId == int.Parse(userid)) { - page = new Page(); - page.SiteId = parent.SiteId; - page.ParentId = parent.PageId; - page.Name = user.Username; - page.Path = parent.Path + "/" + page.Name; - page.Title = page.Name + " - " + parent.Name; - page.Order = 0; - page.IsNavigation = false; - page.Url = ""; - page.ThemeType = parent.ThemeType; - page.DefaultContainerType = parent.DefaultContainerType; - page.Icon = parent.Icon; - page.PermissionList = new List() + page = _pages.GetPage(parent.Path + "/" + user.Username, parent.SiteId); + if (page == null) { - new Permission(PermissionNames.View, int.Parse(userid), true), - new Permission(PermissionNames.View, RoleNames.Everyone, true), - new Permission(PermissionNames.Edit, int.Parse(userid), true) - }; - page.IsPersonalizable = false; - page.UserId = int.Parse(userid); - page = _pages.AddPage(page); - - // copy modules - List pagemodules = _pageModules.GetPageModules(page.SiteId).ToList(); - foreach (PageModule pm in pagemodules.Where(item => item.PageId == parent.PageId && !item.IsDeleted)) - { - Module module = new Module(); - module.SiteId = page.SiteId; - module.PageId = page.PageId; - module.ModuleDefinitionName = pm.Module.ModuleDefinitionName; - module.AllPages = false; - module.PermissionList = new List() + page = new Page(); + page.SiteId = parent.SiteId; + page.ParentId = parent.PageId; + page.Name = (!string.IsNullOrEmpty(user.DisplayName)) ? user.DisplayName : user.Username; + page.Path = parent.Path + "/" + user.Username; + page.Title = page.Name + " - " + parent.Name; + page.Order = 0; + page.IsNavigation = false; + page.Url = ""; + page.ThemeType = parent.ThemeType; + page.DefaultContainerType = parent.DefaultContainerType; + page.Icon = parent.Icon; + page.PermissionList = new List() { new Permission(PermissionNames.View, int.Parse(userid), true), new Permission(PermissionNames.View, RoleNames.Everyone, true), new Permission(PermissionNames.Edit, int.Parse(userid), true) }; - module = _modules.AddModule(module); + page.IsPersonalizable = false; + page.UserId = int.Parse(userid); + page = _pages.AddPage(page); - string content = _modules.ExportModule(pm.ModuleId); - if (content != "") + // copy modules + List pagemodules = _pageModules.GetPageModules(page.SiteId).ToList(); + foreach (PageModule pm in pagemodules.Where(item => item.PageId == parent.PageId && !item.IsDeleted)) { - _modules.ImportModule(module.ModuleId, content); + Module module = new Module(); + module.SiteId = page.SiteId; + module.PageId = page.PageId; + module.ModuleDefinitionName = pm.Module.ModuleDefinitionName; + module.AllPages = false; + module.PermissionList = new List() + { + new Permission(PermissionNames.View, int.Parse(userid), true), + new Permission(PermissionNames.View, RoleNames.Everyone, true), + new Permission(PermissionNames.Edit, int.Parse(userid), true) + }; + module = _modules.AddModule(module); + + string content = _modules.ExportModule(pm.ModuleId); + if (content != "") + { + _modules.ImportModule(module.ModuleId, content); + } + + PageModule pagemodule = new PageModule(); + pagemodule.PageId = page.PageId; + pagemodule.ModuleId = module.ModuleId; + pagemodule.Title = pm.Title; + pagemodule.Pane = pm.Pane; + pagemodule.Order = pm.Order; + pagemodule.ContainerType = pm.ContainerType; + + _pageModules.AddPageModule(pagemodule); } - PageModule pagemodule = new PageModule(); - pagemodule.PageId = page.PageId; - pagemodule.ModuleId = module.ModuleId; - pagemodule.Title = pm.Title; - pagemodule.Pane = pm.Pane; - pagemodule.Order = pm.Order; - pagemodule.ContainerType = pm.ContainerType; - - _pageModules.AddPageModule(pagemodule); + _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create); + _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh); } - - _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Page, page.PageId, SyncEventActions.Create); - _syncManager.AddSyncEvent(_alias.TenantId, EntityNames.Site, page.SiteId, SyncEventActions.Refresh); } else { diff --git a/Oqtane.Server/Controllers/UserController.cs b/Oqtane.Server/Controllers/UserController.cs index 0090dd43..5f28029e 100644 --- a/Oqtane.Server/Controllers/UserController.cs +++ b/Oqtane.Server/Controllers/UserController.cs @@ -648,10 +648,14 @@ namespace Oqtane.Controllers foreach (UserRole userrole in userroles) { roles += userrole.Role.Name + ";"; - if (userrole.Role.Name == RoleNames.Host && userroles.Where(item => item.Role.Name == RoleNames.Admin).FirstOrDefault() == null) + if (userrole.Role.Name == RoleNames.Host && !userroles.Any(item => item.Role.Name == RoleNames.Admin)) { roles += RoleNames.Admin + ";"; } + if (userrole.Role.Name == RoleNames.Host && !userroles.Any(item => item.Role.Name == RoleNames.Registered)) + { + roles += RoleNames.Registered + ";"; + } } if (roles != "") roles = ";" + roles; return roles; diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index 780e0400..4b8cc4bf 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -3,7 +3,7 @@ net7.0 Debug;Release - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git Oqtane diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak index 72e692cf..47ba984b 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.MySQL.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak index ab6529ff..ee3324c0 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.PostgreSQL.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak index e9cd97e6..603f3fd1 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.SqlServer.nupkg.bak differ diff --git a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak index 054330c8..697d02f4 100644 Binary files a/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak and b/Oqtane.Server/wwwroot/Packages/Oqtane.Database.Sqlite.nupkg.bak differ diff --git a/Oqtane.Shared/Oqtane.Shared.csproj b/Oqtane.Shared/Oqtane.Shared.csproj index 793a2db5..e6062c0e 100644 --- a/Oqtane.Shared/Oqtane.Shared.csproj +++ b/Oqtane.Shared/Oqtane.Shared.csproj @@ -3,7 +3,7 @@ net7.0 Debug;Release - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git Oqtane diff --git a/Oqtane.Shared/Shared/Constants.cs b/Oqtane.Shared/Shared/Constants.cs index 916fa310..79c7ada9 100644 --- a/Oqtane.Shared/Shared/Constants.cs +++ b/Oqtane.Shared/Shared/Constants.cs @@ -7,8 +7,8 @@ namespace Oqtane.Shared { public class Constants { - public static readonly string Version = "4.0.0"; - public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0"; + public static readonly string Version = "4.0.1"; + public const string ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,2.0.0,2.0.1,2.0.2,2.1.0,2.2.0,2.3.0,2.3.1,3.0.0,3.0.1,3.0.2,3.0.3,3.1.0,3.1.1,3.1.2,3.1.3,3.1.4,3.2.0,3.2.1,3.3.0,3.3.1,3.4.0,3.4.1,3.4.2,3.4.3,4.0.0,4.0.1"; public const string PackageId = "Oqtane.Framework"; public const string ClientId = "Oqtane.Client"; public const string UpdaterPackageId = "Oqtane.Updater"; diff --git a/Oqtane.Updater/Oqtane.Updater.csproj b/Oqtane.Updater/Oqtane.Updater.csproj index eb79be2f..d7f544f2 100644 --- a/Oqtane.Updater/Oqtane.Updater.csproj +++ b/Oqtane.Updater/Oqtane.Updater.csproj @@ -3,7 +3,7 @@ net7.0 Exe - 4.0.0 + 4.0.1 Oqtane Shaun Walker .NET Foundation @@ -11,7 +11,7 @@ .NET Foundation https://www.oqtane.org https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE - https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.0 + https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.1 https://github.com/oqtane/oqtane.framework Git Oqtane