From 6b289e1a7d5d9b7879d2c25a6be06432c4be17cf Mon Sep 17 00:00:00 2001 From: Dave Woestenborghs Date: Tue, 18 Jul 2017 14:44:57 +0200 Subject: [PATCH 1/2] Fix value converter work for legacy media picker Fix for issue http://issues.umbraco.org/issue/U4-10178 --- .../LegacyMediaPickerPropertyConverter.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs index db115f58de..b8e33c27a1 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs @@ -56,14 +56,10 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters { if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters) { - return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultipleMediaPickerAlias); - } - - if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters) - { - // this is the double legacy media picker, it can pick only single media items - return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias); + return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultipleMediaPickerAlias) || + propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias); // this is the double legacy media picker, it can pick only single media items } + return false; } @@ -270,4 +266,4 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters Storages.Clear(); } } -} \ No newline at end of file +} From 56cff6bba837b4d469212d9204a6a03bcabd1ba8 Mon Sep 17 00:00:00 2001 From: Dave Woestenborghs Date: Tue, 18 Jul 2017 17:11:49 +0200 Subject: [PATCH 2/2] implemented suggestions from @jeavon --- .../LegacyMediaPickerPropertyConverter.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs index b8e33c27a1..8ef11bec8d 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs @@ -54,12 +54,17 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters /// public override bool IsConverter(PublishedPropertyType propertyType) { - if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters) + if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters && propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultipleMediaPickerAlias)) { - return propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MultipleMediaPickerAlias) || - propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias); // this is the double legacy media picker, it can pick only single media items + return true; } - + + if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters && propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias)) + { + // this is the double legacy media picker, it can pick only single media items + return true; + } + return false; }