Cleanup PublishedMember
This commit is contained in:
@@ -1,58 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Umbraco.Core.Models;
|
||||
using Umbraco.Core.Models.PublishedContent;
|
||||
using Umbraco.Web.Composing;
|
||||
|
||||
namespace Umbraco.Web.Models
|
||||
{
|
||||
public static class PublishedProperty
|
||||
{
|
||||
/// <summary>
|
||||
/// Maps a collection of Property to a collection of IPublishedProperty for a specified collection of PublishedPropertyType.
|
||||
/// </summary>
|
||||
/// <param name="propertyTypes">The published property types.</param>
|
||||
/// <param name="properties">The properties.</param>
|
||||
/// <param name="map">A mapping function.</param>
|
||||
/// <returns>A collection of IPublishedProperty corresponding to the collection of PublishedPropertyType
|
||||
/// and taking values from the collection of Property.</returns>
|
||||
/// <remarks>Ensures that all conversions took place correctly.</remarks>
|
||||
internal static IEnumerable<IPublishedProperty> MapProperties(
|
||||
IEnumerable<IPublishedPropertyType> propertyTypes, IEnumerable<Property> properties,
|
||||
Func<IPublishedPropertyType, object, IPublishedProperty> map)
|
||||
{
|
||||
var propertyEditors = Current.PropertyEditors;
|
||||
var dataTypeService = Current.Services.DataTypeService;
|
||||
|
||||
// TODO: not dealing with variants
|
||||
// but the entire thing should die anyways
|
||||
|
||||
return propertyTypes.Select(x =>
|
||||
{
|
||||
var p = properties.SingleOrDefault(xx => xx.Alias == x.Alias);
|
||||
var v = p == null || p.GetValue() == null ? null : p.GetValue();
|
||||
if (v != null)
|
||||
{
|
||||
var e = propertyEditors[x.EditorAlias];
|
||||
|
||||
// We are converting to string, even for database values which are integer or
|
||||
// DateTime, which is not optimum. Doing differently would require that we have a way to tell
|
||||
// whether the conversion to XML string changes something or not... which we don't, and we
|
||||
// don't want to implement it as PropertyValueEditor.ConvertDbToXml/String should die anyway.
|
||||
|
||||
// Don't think about improving the situation here: this is a corner case and the real
|
||||
// thing to do is to get rig of PropertyValueEditor.ConvertDbToXml/String.
|
||||
|
||||
// Use ConvertDbToString to keep it simple, although everywhere we use ConvertDbToXml and
|
||||
// nothing ensures that the two methods are consistent.
|
||||
|
||||
if (e != null)
|
||||
v = e.GetValueEditor().ConvertDbToString(p.PropertyType, v, dataTypeService);
|
||||
}
|
||||
|
||||
return map(x, v);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user