From 320b53ae3cce6d2b0306c2b5c15ec5362af00c2f Mon Sep 17 00:00:00 2001 From: Stephan Date: Wed, 28 May 2014 11:36:31 +0200 Subject: [PATCH] U4-4773 - bring back IPublishedContentProperty Alias and Version (compat) --- src/Umbraco.Core/Dynamics/PropertyResult.cs | 3 +++ src/Umbraco.Core/Models/IPublishedContentProperty.cs | 5 +++++ .../Models/PublishedContent/PublishedPropertyBase.cs | 3 +++ .../PublishedContent/PublishedContentTestElements.cs | 3 +++ 4 files changed, 14 insertions(+) diff --git a/src/Umbraco.Core/Dynamics/PropertyResult.cs b/src/Umbraco.Core/Dynamics/PropertyResult.cs index 55182593a2..9f4fa93820 100644 --- a/src/Umbraco.Core/Dynamics/PropertyResult.cs +++ b/src/Umbraco.Core/Dynamics/PropertyResult.cs @@ -37,6 +37,9 @@ namespace Umbraco.Core.Dynamics public object Value { get { return _source == null ? _value : _source.Value; } } public object XPathValue { get { return Value == null ? null : Value.ToString(); } } + public string Alias { get { return PropertyTypeAlias; }} + public Guid Version { get { return Guid.Empty; }} + // implements IHtmlString.ToHtmlString public string ToHtmlString() { diff --git a/src/Umbraco.Core/Models/IPublishedContentProperty.cs b/src/Umbraco.Core/Models/IPublishedContentProperty.cs index 96e9f0c22a..5054903632 100644 --- a/src/Umbraco.Core/Models/IPublishedContentProperty.cs +++ b/src/Umbraco.Core/Models/IPublishedContentProperty.cs @@ -1,3 +1,5 @@ +using System; + namespace Umbraco.Core.Models { /// @@ -56,5 +58,8 @@ namespace Umbraco.Core.Models /// It has been fully prepared and processed by the appropriate converter. /// object XPathValue { get; } + + string Alias { get; } + Guid Version { get; } } } \ No newline at end of file diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs index 3afc80fe4b..86aad8a250 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs @@ -27,5 +27,8 @@ namespace Umbraco.Core.Models.PublishedContent public abstract object DataValue { get; } public abstract object Value { get; } public abstract object XPathValue { get; } + + public string Alias { get { return PropertyTypeAlias; } } + public Guid Version { get { return Guid.Empty; } } } } diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs index d37dd8a15d..ff9dee442e 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs @@ -231,6 +231,9 @@ namespace Umbraco.Tests.PublishedContent public object Value { get; set; } public bool HasValue { get; set; } public object XPathValue { get; set; } + + public string Alias { get { return PropertyTypeAlias; } } + public Guid Version { get { return Guid.Empty; } } } [PublishedContentModel("ContentType2")]