From 8958b61fdd65ab25a2c6235dba9156e415303270 Mon Sep 17 00:00:00 2001 From: Ikuo Ohba Date: Sun, 21 Apr 2024 20:44:41 +0900 Subject: [PATCH 01/11] Datetime formatting issue --- Oqtane.Client/Services/VisitorService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Services/VisitorService.cs b/Oqtane.Client/Services/VisitorService.cs index 9febe7f9..ae2e46c1 100644 --- a/Oqtane.Client/Services/VisitorService.cs +++ b/Oqtane.Client/Services/VisitorService.cs @@ -18,7 +18,7 @@ namespace Oqtane.Services public async Task> GetVisitorsAsync(int siteId, DateTime fromDate) { - List visitors = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&fromdate={fromDate.ToString("dd-MMM-yyyy")}"); + List visitors = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&fromdate={fromDate.ToString("yyyy-MM-dd")}"); return visitors.OrderByDescending(item => item.VisitedOn).ToList(); } From 7b8e7ac5c23fffd3fb0cbd573ba11acb33a42ebc Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 22 Apr 2024 17:14:09 +0200 Subject: [PATCH 02/11] Fix for #4168 Resx entry for Module Settings Permissions tab --- Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx index 722fa2f1..b872c727 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Modules/Settings.resx @@ -177,4 +177,7 @@ Expiry Date: + + Permissions + \ No newline at end of file From b5ebcc3e0770fec9aae6b9d1df767ade55731f11 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 22 Apr 2024 17:46:13 +0200 Subject: [PATCH 03/11] Update Index.razor --- Oqtane.Client/Modules/Admin/Pages/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index f1b9e9b4..391c6c42 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -17,7 +17,7 @@ @SharedLocalizer["Name"] - + @(new string('-', context.Level * 2))@(context.Name) From 294f511b9a5c17918a7f0f1efe4ade2fc7f98a6c Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 22 Apr 2024 18:27:01 +0200 Subject: [PATCH 04/11] Missing parameters #4172 #4173 --- Oqtane.Client/Modules/Admin/Profiles/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Users/Index.razor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Profiles/Index.razor b/Oqtane.Client/Modules/Admin/Profiles/Index.razor index 587fa452..6152062d 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Index.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Index.razor @@ -22,7 +22,7 @@ else @Localizer["Order"] - + @context.Name @context.Title diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index ed050ac7..a04be4c3 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -32,13 +32,13 @@ else - + - + @context.User.Username @context.User.DisplayName From ead954ddaaa5874b806fccd9396c245b7379e76a Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 22 Apr 2024 19:18:02 +0200 Subject: [PATCH 05/11] Missing Parameters #4174 #4175 --- Oqtane.Client/Modules/Admin/Logs/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Visitors/Index.razor | 2 +- Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index 6932f784..dfb0cf8d 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -63,7 +63,7 @@ else @Localizer["Function"] - + @context.LogDate @context.Level @context.Feature diff --git a/Oqtane.Client/Modules/Admin/Visitors/Index.razor b/Oqtane.Client/Modules/Admin/Visitors/Index.razor index 61487cf3..39b14006 100644 --- a/Oqtane.Client/Modules/Admin/Visitors/Index.razor +++ b/Oqtane.Client/Modules/Admin/Visitors/Index.razor @@ -43,7 +43,7 @@ else @Localizer["Created"] - + @context.IPAddress @if (context.UserId != null) diff --git a/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx index 98f8530c..694119f3 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Profiles/Index.resx @@ -147,4 +147,7 @@ Title + + Detail + \ No newline at end of file From 708d473b475204cd0b4bca05bc19bf9925c963f4 Mon Sep 17 00:00:00 2001 From: Leigh Pointer Date: Mon, 22 Apr 2024 20:19:33 +0200 Subject: [PATCH 06/11] Missing Parameter #4176 --- Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor index 2d3b80a7..485f027f 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor @@ -50,7 +50,7 @@ else   - + @if (context.AssemblyName != Constants.ClientId) { From adfd0d5c183e456a271ad813b57fdab17a8723df Mon Sep 17 00:00:00 2001 From: Ikuo Ohba Date: Tue, 23 Apr 2024 21:27:13 +0900 Subject: [PATCH 07/11] Fix MicroService And Controller --- Oqtane.Client/Services/VisitorService.cs | 3 ++- Oqtane.Server/Controllers/VisitorController.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Services/VisitorService.cs b/Oqtane.Client/Services/VisitorService.cs index ae2e46c1..b29e9c3c 100644 --- a/Oqtane.Client/Services/VisitorService.cs +++ b/Oqtane.Client/Services/VisitorService.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Oqtane.Documentation; using Oqtane.Shared; using System; +using System.Globalization; namespace Oqtane.Services { @@ -18,7 +19,7 @@ namespace Oqtane.Services public async Task> GetVisitorsAsync(int siteId, DateTime fromDate) { - List visitors = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&fromdate={fromDate.ToString("yyyy-MM-dd")}"); + List visitors = await GetJsonAsync>($"{Apiurl}?siteid={siteId}&fromdate={fromDate.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)}"); return visitors.OrderByDescending(item => item.VisitedOn).ToList(); } diff --git a/Oqtane.Server/Controllers/VisitorController.cs b/Oqtane.Server/Controllers/VisitorController.cs index 46bf8935..224aaa5f 100644 --- a/Oqtane.Server/Controllers/VisitorController.cs +++ b/Oqtane.Server/Controllers/VisitorController.cs @@ -8,6 +8,7 @@ using Oqtane.Infrastructure; using Oqtane.Repository; using System.Net; using System; +using System.Globalization; namespace Oqtane.Controllers { @@ -33,7 +34,7 @@ namespace Oqtane.Controllers int SiteId; if (int.TryParse(siteid, out SiteId) && SiteId == _alias.SiteId) { - return _visitors.GetVisitors(SiteId, DateTime.Parse(fromdate)); + return _visitors.GetVisitors(SiteId, DateTime.ParseExact(fromdate, "yyyy-MM-dd", CultureInfo.InvariantCulture)); } else { From 791cc70b094a4f01c241e91cba58edd9d4feb12b Mon Sep 17 00:00:00 2001 From: sbwalker Date: Tue, 23 Apr 2024 12:54:44 -0400 Subject: [PATCH 08/11] replace form with link in AdminContainer --- Oqtane.Client/Themes/AdminContainer.razor | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Oqtane.Client/Themes/AdminContainer.razor b/Oqtane.Client/Themes/AdminContainer.razor index 60deaa59..7aec6816 100644 --- a/Oqtane.Client/Themes/AdminContainer.razor +++ b/Oqtane.Client/Themes/AdminContainer.razor @@ -1,6 +1,5 @@ @namespace Oqtane.Themes @inherits ContainerBase -@inject NavigationManager NavigationManager