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

Variant names, availability, etc

Browse Source
This commit is contained in:
Stephan
2018-04-18 14:43:07 +02:00
parent d4244d3807
commit ec7b038569
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Models/Content.cs
View File

@@ -21,7 +21,6 @@ namespace Umbraco.Core.Models
private DateTime? _expireDate;
private Dictionary<int, string> _publishNames;
private static readonly Dictionary<int, string> NoPublishNames = new Dictionary<int, string>();
private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
/// <summary>
@@ -201,7 +200,7 @@ namespace Umbraco.Core.Models
/// <inheritdoc/>
[IgnoreDataMember]
public IReadOnlyDictionary<int, string> PublishNames => _publishNames ?? NoPublishNames;
public IReadOnlyDictionary<int, string> PublishNames => _publishNames ?? NoNames;
/// <inheritdoc/>
public string GetPublishName(int? languageId)
@@ -238,6 +237,7 @@ namespace Umbraco.Core.Models
return;
}
if (_publishNames == null) return;
_publishNames.Remove(languageId.Value);
if (_publishNames.Count == 0)
_publishNames = null;

3
src/Umbraco.Core/Models/ContentBase.cs
View File

@@ -18,6 +18,7 @@ namespace Umbraco.Core.Models
[DebuggerDisplay("Id: {Id}, Name: {Name}, ContentType: {ContentTypeBase.Alias}")]
public abstract class ContentBase : TreeEntityBase, IContentBase
{
protected static readonly Dictionary<int, string> NoNames = new Dictionary<int, string>();
private static readonly Lazy<PropertySelectors> Ps = new Lazy<PropertySelectors>();
private int _contentTypeId;
@@ -124,7 +125,7 @@ namespace Umbraco.Core.Models
[DataMember]
public virtual IReadOnlyDictionary<int, string> Names
{
get => _names;
get => _names ?? NoNames;
set
{
foreach (var (languageId, name) in value)