diff --git a/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs b/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs index a4d73c7f..9eb54fdd 100644 --- a/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs +++ b/Lombiq.HelpfulLibraries.Common/Utilities/Union.cs @@ -27,7 +27,7 @@ internal Union(T1 left, T2 right, bool leftIsSet) public static class Union { + // The value of leftIsSet doesn't matter. public static Union Neither() => - // The value of leftIsSet doesn't matter. new(default, default, leftIsSet: true); } diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs index 13c59fe9..d755b4f0 100644 --- a/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs +++ b/Lombiq.HelpfulLibraries.OrchardCore/Data/QueryExtensions.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Text.Json.Serialization; using System.Threading.Tasks; using YesSql.Indexes; @@ -195,4 +196,9 @@ public static Task> GetPageAndPagerAsync( } } -public record GetPageAndPagerViewModel(IList Items, IShape Pager, int Total, int PageSize, int PageIndex); +public record GetPageAndPagerViewModel( + IList Items, + [property: JsonIgnore] IShape Pager, + int Total, + int PageSize, + int PageIndex); diff --git a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs index cea5c50c..c430253e 100644 --- a/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs +++ b/Lombiq.HelpfulLibraries.OrchardCore/Users/AuthorizationServiceExtensions.cs @@ -51,7 +51,7 @@ public static Task AuthorizeCurrentUserAsync( /// The final outcome. public static async Task AuthorizeForCurrentUserValidateAndExecuteAsync( this IAuthorizationService service, - Controller controller, + ControllerBase controller, IEnumerable permissions, Func> validateAsync, Func> executeAsync, @@ -82,7 +82,7 @@ public static async Task AuthorizeForCurrentUserValidateAndExecut /// public static Task AuthorizeForCurrentUserAndExecuteAsync( this IAuthorizationService service, - Controller controller, + ControllerBase controller, IEnumerable permissions, Func> executeAsync, string authenticationScheme = "Api", @@ -98,7 +98,7 @@ public static Task AuthorizeForCurrentUserAndExecuteAsync public static Task AuthorizeForCurrentUserValidateNotNullAndExecuteAsync( this IAuthorizationService service, - Controller controller, + ControllerBase controller, IEnumerable permissions, Func> validateAsync, Func> executeAsync,