Browse Source

Cleanup.

pull/478/head
Sebastian 6 years ago
parent
commit
4b59ce937c
  1. 3
      backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs
  2. 4
      backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs

3
backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs

@ -120,8 +120,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries.Steps
yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeHidden()); yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeHidden());
} }
if (context.ShouldCleanup())
{
yield return FieldConverters.ExcludeChangedTypes(); yield return FieldConverters.ExcludeChangedTypes();
yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeChangedTypes()); yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeChangedTypes());
}
if (cleanReferences != null) if (cleanReferences != null)
{ {

4
backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs

@ -189,7 +189,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent
.AddValue("en", null) .AddValue("en", null)
.AddValue("de", 1); .AddValue("de", 1);
var result = FieldConverters.ExcludeChangedTypes()(source, field); var result = FieldConverters.ForValues(ValueConverters.ExcludeChangedTypes())(source, field);
Assert.Same(source, result); Assert.Same(source, result);
} }
@ -204,7 +204,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent
.AddValue("en", "EN") .AddValue("en", "EN")
.AddValue("de", 0); .AddValue("de", 0);
var result = FieldConverters.ExcludeChangedTypes()(source, field); var result = FieldConverters.ForValues(ValueConverters.ExcludeChangedTypes())(source, field);
Assert.Null(result); Assert.Null(result);
} }

Loading…
Cancel
Save