From fd201bf5dbcd951df10c1b73902324f45a3a7304 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 20 Nov 2018 14:48:18 +0100 Subject: [PATCH] Rename asset urls field in context. --- .../Contents/ContentQueryService.cs | 4 ++-- src/Squidex.Domain.Apps.Entities/QueryContext.cs | 6 +++--- .../Areas/Api/Controllers/Contents/ContentsController.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs index d0a326f76..3601cfcec 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs @@ -213,9 +213,9 @@ namespace Squidex.Domain.Apps.Entities.Contents yield return FieldConverters.FilterLanguages(context.App.LanguagesConfig, context.Languages); } - if (context.AssetFieldsToResolve?.Any() == true) + if (context.AssetUrlsToResolve?.Any() == true) { - yield return FieldConverters.ResolveAssetUrls(context.AssetFieldsToResolve, assetUrlGenerator); + yield return FieldConverters.ResolveAssetUrls(context.AssetUrlsToResolve, assetUrlGenerator); } } } diff --git a/src/Squidex.Domain.Apps.Entities/QueryContext.cs b/src/Squidex.Domain.Apps.Entities/QueryContext.cs index 6ee665105..5420c80fa 100644 --- a/src/Squidex.Domain.Apps.Entities/QueryContext.cs +++ b/src/Squidex.Domain.Apps.Entities/QueryContext.cs @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities public bool Unpublished { get; set; } - public ISet AssetFieldsToResolve { get; private set; } + public ISet AssetUrlsToResolve { get; private set; } public ISet Languages { get; private set; } @@ -56,7 +56,7 @@ namespace Squidex.Domain.Apps.Entities return Clone(c => c.Flatten = flatten); } - public QueryContext WithAssetFieldsToResolve(IEnumerable fieldNames) + public QueryContext WithAssetUrlsToResolve(IEnumerable fieldNames) { if (fieldNames != null) { @@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Entities } } - c.AssetFieldsToResolve = fields; + c.AssetUrlsToResolve = fields; }); } diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index d85bd3583..e53ea81b5 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -510,7 +510,7 @@ namespace Squidex.Areas.Api.Controllers.Contents private QueryContext Context() { return QueryContext.Create(App, User) - .WithAssetFieldsToResolve(Request.Headers["X-AssetFields"]) + .WithAssetUrlsToResolve(Request.Headers["X-Resolve-Urls"]) .WithFlatten(Request.Headers.ContainsKey("X-Flatten")) .WithLanguages(Request.Headers["X-Languages"]) .WithUnpublished(Request.Headers.ContainsKey("X-Unpublished"));