From 5a35b4ac90e671e10edb59cd3dcf8522738f3119 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 22 Oct 2018 11:22:11 +0200 Subject: [PATCH] Fix for language specific languages. --- .../GenerateEdmSchema/EdmSchemaExtensions.cs | 2 +- .../Contents/Visitors/FindExtensions.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmSchemaExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmSchemaExtensions.cs index 5a5b88cfa..4316b0d0c 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmSchemaExtensions.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmSchemaExtensions.cs @@ -48,7 +48,7 @@ namespace Squidex.Domain.Apps.Core.GenerateEdmSchema foreach (var partitionItem in partition) { - partitionType.AddStructuralProperty(partitionItem.Key, edmValueType); + partitionType.AddStructuralProperty(partitionItem.Key.EscapeEdmField(), edmValueType); } edmType.AddStructuralProperty(field.Name.EscapeEdmField(), new EdmComplexTypeReference(partitionType, false)); diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs index f37cd8110..2f25d959d 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs @@ -70,6 +70,11 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors result[1] = field.Id.ToString(); } + if (result.Count > 2) + { + result[2] = result[2].UnescapeEdmField(); + } + if (result.Count > 0) { if (result[0].Equals("Data", StringComparison.CurrentCultureIgnoreCase))