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

updates some more logic when saving macro properties to always try to map to the new ones if legacy aliases are used.

Browse Source
This commit is contained in:
Shannon
2013-11-07 16:07:08 +11:00
parent 164b630d5e
commit bacdcb7abf
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Umbraco.Core/Models/MacroProperty.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Reflection;
using System.Runtime.Serialization;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Core.Models
{
@@ -29,6 +30,14 @@ namespace Umbraco.Core.Models
_alias = alias;
_name = name;
_sortOrder = sortOrder;
//try to get the new mapped parameter editor
var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
if (mapped.IsNullOrWhiteSpace() == false)
{
editorAlias = mapped;
}
_editorAlias = editorAlias;
}
@@ -46,6 +55,14 @@ namespace Umbraco.Core.Models
_alias = alias;
_name = name;
_sortOrder = sortOrder;
//try to get the new mapped parameter editor
var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
if (mapped.IsNullOrWhiteSpace() == false)
{
editorAlias = mapped;
}
_editorAlias = editorAlias;
}
@@ -145,7 +162,17 @@ namespace Umbraco.Core.Models
{
SetPropertyValueAndDetectChanges(o =>
{
_editorAlias = value;
//try to get the new mapped parameter editor
var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(value, false);
if (mapped.IsNullOrWhiteSpace() == false)
{
_editorAlias = mapped;
}
else
{
_editorAlias = value;
}
return _editorAlias;
}, _editorAlias, PropertyTypeSelector);
}

2
src/umbraco.cms/businesslogic/macro/MacroProperty.cs
View File

@@ -123,7 +123,7 @@ namespace umbraco.cms.businesslogic.macro
var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(value, false);
if (mapped.IsNullOrWhiteSpace() == false)
{
_parameterEditorAlias = value;
_parameterEditorAlias = mapped;
}
else
{