From 3a9885abd83ec2aa357e511d927949147adc09b8 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Fri, 28 Jun 2024 16:15:28 -0400 Subject: [PATCH] modify query property names --- Oqtane.Server/Repository/SearchContentRepository.cs | 8 ++++---- Oqtane.Shared/Models/SearchContent.cs | 2 +- Oqtane.Shared/Models/SearchQuery.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Oqtane.Server/Repository/SearchContentRepository.cs b/Oqtane.Server/Repository/SearchContentRepository.cs index 0f6071c5..abfcd276 100644 --- a/Oqtane.Server/Repository/SearchContentRepository.cs +++ b/Oqtane.Server/Repository/SearchContentRepository.cs @@ -31,14 +31,14 @@ namespace Oqtane.Repository searchContents = searchContents.Where(i => searchQuery.EntityNames.Contains(i.EntityName)); } - if (searchQuery.BeginModifiedTimeUtc != DateTime.MinValue) + if (searchQuery.From != DateTime.MinValue) { - searchContents = searchContents.Where(i => i.ContentModifiedOn >= searchQuery.BeginModifiedTimeUtc); + searchContents = searchContents.Where(i => i.ContentModifiedOn >= searchQuery.From); } - if (searchQuery.EndModifiedTimeUtc != DateTime.MinValue) + if (searchQuery.To != DateTime.MinValue) { - searchContents = searchContents.Where(i => i.ContentModifiedOn <= searchQuery.EndModifiedTimeUtc); + searchContents = searchContents.Where(i => i.ContentModifiedOn <= searchQuery.To); } if (searchQuery.Properties != null && searchQuery.Properties.Any()) diff --git a/Oqtane.Shared/Models/SearchContent.cs b/Oqtane.Shared/Models/SearchContent.cs index 9a3c0cbe..a174aa31 100644 --- a/Oqtane.Shared/Models/SearchContent.cs +++ b/Oqtane.Shared/Models/SearchContent.cs @@ -22,7 +22,7 @@ namespace Oqtane.Models public string Url { get; set; } - public string Permissions { get; set; } + public string Permissions { get; set; } // comma delimited EntityName:EntityId,EntityName:EntityId public string ContentModifiedBy { get; set; } diff --git a/Oqtane.Shared/Models/SearchQuery.cs b/Oqtane.Shared/Models/SearchQuery.cs index 70e3880d..691f8491 100644 --- a/Oqtane.Shared/Models/SearchQuery.cs +++ b/Oqtane.Shared/Models/SearchQuery.cs @@ -16,9 +16,9 @@ namespace Oqtane.Models public List EntityNames { get; set; } = new List(); - public DateTime BeginModifiedTimeUtc { get; set; } + public DateTime From { get; set; } - public DateTime EndModifiedTimeUtc { get; set; } + public DateTime To { get; set; } public IDictionary Properties { get; set; } = new Dictionary();