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

Gets macro editor working with new db changes and using new MacroService data layer

Browse Source
This commit is contained in:
Shannon
2013-09-19 17:34:57 +10:00
parent ec3761baa0
commit c0a303b328
25 changed files with 368 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/umbraco.editorControls/macrocontainer/MacroEditor.cs
View File

@@ -199,23 +199,19 @@ namespace umbraco.editorControls.macrocontainer
}
foreach (MacroProperty macroProperty in formMacro.Properties)
{
//Only add properties that people may see.
if (macroProperty.Public)
var prop = new PersistableMacroProperty();
prop.Alias = macroProperty.Alias;
prop.Name = macroProperty.Name;
prop.AssemblyName = macroProperty.Type.Assembly;
prop.TypeName = macroProperty.Type.Type;
//Assign value if specified
if (DataValues[macroProperty.Alias.ToLower()] != null)
{
PersistableMacroProperty prop = new PersistableMacroProperty();
prop.Alias = macroProperty.Alias;
prop.Name = macroProperty.Name;
prop.AssemblyName = macroProperty.Type.Assembly;
prop.TypeName = macroProperty.Type.Type;
//Assign value if specified
if (DataValues[macroProperty.Alias.ToLower()] != null)
{
prop.Value = DataValues[macroProperty.Alias.ToLower()].ToString();
}
props.Add(prop);
prop.Value = DataValues[macroProperty.Alias.ToLower()].ToString();
}
props.Add(prop);
}
}
}