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

Fix Importing Macro when macro already exists

Browse Source 
ParseMacroElement called by ImportMacro was no checking for to see if
the macro or properties already exists - caused SQL errors on import of
macro. Added check to look for existing macro, and only add new
properties on import (in line with other import methods)
This commit is contained in:
Kevin Jump
2014-01-23 16:05:08 +00:00
parent a7107f01e8
commit a705561a51
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Services/PackagingService.cs
View File

@@ -1244,7 +1244,8 @@ namespace Umbraco.Core.Services
dontRender = bool.Parse(dontRenderElement.Value);
}
var macro = new Macro(macroAlias, macroName, controlType, controlAssembly, xsltPath, scriptPath,
var existingMacro = _macroService.GetByAlias(macroAlias) as Macro;
var macro = existingMacro ?? new Macro(macroAlias, macroName, controlType, controlAssembly, xsltPath, scriptPath,
cacheByPage, cacheByMember, dontRender, useInEditor, cacheDuration);
var properties = macroElement.Element("properties");
@@ -1262,6 +1263,7 @@ namespace Umbraco.Core.Services
sortOrder = int.Parse(sortOrderAttribute.Value);
}
if (macro.Properties.Any(x => x.Alias == propertyAlias)) continue;
macro.Properties.Add(new MacroProperty(propertyAlias, propertyName, sortOrder, editorAlias));
sortOrder++;
}