yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore macros completely in deliveryapi (#14262)

Browse Source 
* Hack a fix for MNTP that saves content in configuration instead of document

* Ignore macro parsing in delivery api, instead of exploding
This commit is contained in:
Bjarke Berg
2023-05-17 11:03:27 +02:00
committed by GitHub
parent c5e524c9b9
commit a4202f352a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/PropertyEditors/ValueConverters/MultiNodeTreePickerValueConverter.cs
View File

@@ -204,6 +204,13 @@ public class MultiNodeTreePickerValueConverter : PropertyValueConverterBase, IDe
IPublishedSnapshot publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
var entityType = GetEntityType(propertyType);
if (entityType == "content")
{
// TODO Why do MNTP config saves "content" and not "document"?
entityType = Constants.UdiEntityType.Document;
}
GuidUdi[] entityTypeUdis = udis.Where(udi => udi.EntityType == entityType).OfType<GuidUdi>().ToArray();
return entityType switch
{

9
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
View File

@@ -90,7 +90,7 @@ public class RteMacroRenderingValueConverter : SimpleTinyMceValueConverter, IDel
{
return new RichTextModel
{
Markup = Convert(inter, preview) ?? string.Empty
Markup = Convert(inter, preview, false) ?? string.Empty
};
}
@@ -129,7 +129,7 @@ public class RteMacroRenderingValueConverter : SimpleTinyMceValueConverter, IDel
}
}
private string? Convert(object? source, bool preview)
private string? Convert(object? source, bool preview, bool handleMacros = true)
{
if (source == null)
{
@@ -144,7 +144,10 @@ public class RteMacroRenderingValueConverter : SimpleTinyMceValueConverter, IDel
sourceString = _imageSourceParser.EnsureImageSources(sourceString);
// ensure string is parsed for macros and macros are executed correctly
sourceString = RenderRteMacros(sourceString, preview);
if (handleMacros)
{
sourceString = RenderRteMacros(sourceString, preview);
}
// find and remove the rel attributes used in the Umbraco UI from img tags
var doc = new HtmlDocument();

6
tests/Umbraco.Tests.UnitTests/Umbraco.Core/DeliveryApi/MultiNodeTreePickerValueConverterTests.cs
View File

@@ -93,7 +93,9 @@ public class MultiNodeTreePickerValueConverterTests : PropertyValueConverterTest
}
[Test]
public void MultiNodeTreePickerValueConverter_RendersContentProperties()
[TestCase(Constants.UdiEntityType.Document)]
[TestCase("content")]
public void MultiNodeTreePickerValueConverter_RendersContentProperties(string entityType)
{
var content = new Mock<IPublishedContent>();
@@ -112,7 +114,7 @@ public class MultiNodeTreePickerValueConverterTests : PropertyValueConverterTest
.Setup(pcc => pcc.GetById(key))
.Returns(content.Object);
var publishedDataType = MultiNodePickerPublishedDataType(false, Constants.UdiEntityType.Document);
var publishedDataType = MultiNodePickerPublishedDataType(false, entityType);
var publishedPropertyType = new Mock<IPublishedPropertyType>();
publishedPropertyType.SetupGet(p => p.DataType).Returns(publishedDataType);