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

Merge pull request #2055 from dawoe/patch-2

Browse Source 
Fix value converter work for legacy media picker
This commit is contained in:
Sebastiaan Janssen
2017-07-19 12:31:46 +02:00
committed by GitHub
parent 9d55656ae9 56cff6bba8
commit e702fe2877
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web/PropertyEditors/ValueConverters/LegacyMediaPickerPropertyConverter.cs
View File

@@ -54,16 +54,17 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
/// </returns>
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);
return true;
}
if (UmbracoConfig.For.UmbracoSettings().Content.EnablePropertyValueConverters)
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 propertyType.PropertyEditorAlias.Equals(Constants.PropertyEditors.MediaPickerAlias);
return true;
}
return false;
}
@@ -270,4 +271,4 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
Storages.Clear();
}
}
}
}