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

Fixes: U4-3430 Save Properties not working for usercontrol macro

Browse Source
This commit is contained in:
Shannon
2013-11-14 21:56:01 +11:00
parent 10e65e8027
commit 6d2caaa723
3 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/PluginManager.cs
View File

@@ -430,7 +430,7 @@ namespace Umbraco.Core
internal IEnumerable<Type> ResolvePropertyEditors()
{
//return all proeprty editor types found except for the base property editor type
return ResolveTypes<PropertyEditor>()
return ResolveTypes<PropertyEditor>().ToArray()
.Except(new[] {typeof (PropertyEditor)});
}
@@ -440,7 +440,7 @@ namespace Umbraco.Core
internal IEnumerable<Type> ResolveParameterEditors()
{
//return all paramter editor types found except for the base property editor type
return ResolveTypes<IParameterEditor>()
return ResolveTypes<IParameterEditor>().ToArray()
.Except(new[] { typeof(ParameterEditor), typeof(PropertyEditor) });
}

9
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -618,6 +618,13 @@
<Compile Include="Umbraco\TreeInit.aspx.designer.cs">
<DependentUpon>treeInit.aspx</DependentUpon>
</Compile>
<Compile Include="UserControls\MyTest.ascx.cs">
<DependentUpon>MyTest.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="UserControls\MyTest.ascx.designer.cs">
<DependentUpon>MyTest.ascx</DependentUpon>
</Compile>
<Content Include="Umbraco\create.aspx" />
<Content Include="Umbraco\Logout.aspx" />
<Content Include="Umbraco\umbraco.aspx" />
@@ -2188,6 +2195,7 @@
<None Include="Umbraco_client\CodeMirror\js\mode\r\LICENSE" />
<Content Include="Umbraco_client\CodeMirror\js\mode\sieve\LICENSE" />
<None Include="Umbraco_client\CodeMirror\js\mode\xquery\LICENSE" />
<Content Include="UserControls\MyTest.ascx" />
<Content Include="Views\Web.config" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -2624,7 +2632,6 @@
<Folder Include="Scripts\" />
<Folder Include="Umbraco_Client\FolderBrowser\Images\" />
<Folder Include="Umbraco_Client\Tags\images\" />
<Folder Include="UserControls\" />
<Folder Include="Views\MacroPartials\" />
<Folder Include="Views\Partials\" />
</ItemGroup>

103
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
View File

@@ -11,10 +11,13 @@ using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
using System.Reflection;
using System.Collections.Specialized;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Core.Models;
using Umbraco.Core.PropertyEditors;
using umbraco.BusinessLogic;
using umbraco.cms.businesslogic.macro;
using System.Collections.Generic;
using MacroProperty = umbraco.cms.businesslogic.macro.MacroProperty;
namespace umbraco.developer
{
@@ -94,7 +97,7 @@ namespace umbraco.developer
MacroProperties.Items.Clear();
foreach (var pi in type.GetProperties())
{
if (pi.CanWrite && fullControlAssemblyName == pi.DeclaringType.Namespace + "." + pi.DeclaringType.Name)
if (pi.CanWrite && ((fullControlAssemblyName == pi.DeclaringType.Namespace + "." + pi.DeclaringType.Name) || pi.DeclaringType == type))
{
MacroProperties.Items.Add(new ListItem(pi.Name + " <span style=\"color: #99CCCC\">(" + pi.PropertyType.Name + ")</span>", pi.PropertyType.Name));
}
@@ -120,51 +123,54 @@ namespace umbraco.developer
var result = "";
// Get the macro object
var macroObject = new Macro(Convert.ToInt32(Request.QueryString["macroID"]));
var macroObject = ApplicationContext.Current.Services.MacroService.GetById(Convert.ToInt32(Request.QueryString["macroID"]));
//// Load all macroPropertyTypes
//var macroPropertyTypes = new Hashtable();
//var macroPropertyIds = new Hashtable();
// Load all macroPropertyTypes
var macroPropertyTypes = new Hashtable();
var macroPropertyIds = new Hashtable();
var macroPropTypes = MacroPropertyType.GetAll;
foreach (var mpt in macroPropTypes)
{
macroPropertyIds.Add(mpt.Alias, mpt.Id.ToString());
macroPropertyTypes.Add(mpt.Alias, mpt.BaseType);
}
//var macroPropTypes = ParameterEditorResolver.Current.ParameterEditors.ToArray();
//foreach (var mpt in macroPropTypes)
//{
// macroPropertyIds.Add(mpt.Alias, mpt.Id.ToString());
// macroPropertyTypes.Add(mpt.Alias, mpt.BaseType);
//}
var changed = false;
foreach (ListItem li in MacroProperties.Items)
{
if (li.Selected && !MacroHasProperty(macroObject, li.Text.Substring(0, li.Text.IndexOf(" ")).ToLower()))
if (li.Selected && MacroHasProperty(macroObject, li.Text.Substring(0, li.Text.IndexOf(" ", StringComparison.Ordinal)).ToLower()) == false)
{
result += "<li>Added: " + SpaceCamelCasing(li.Text) + "</li>";
var macroPropertyTypeAlias = FindMacroType(macroPropertyTypes, li.Value);
if (macroPropertyTypeAlias == "")
macroPropertyTypeAlias = "text";
var propertyId = macroPropertyIds[macroPropertyTypeAlias];
if (propertyId != null)
var macroPropertyTypeAlias = GetMacroTypeFromClrType(li.Value);
macroObject.Properties.Add(new Umbraco.Core.Models.MacroProperty
{
var macroPropertyTypeId = 0;
if(int.TryParse(string.Format("{0}", propertyId), out macroPropertyTypeId))
{
MacroProperty.MakeNew(macroObject,
true,
li.Text.Substring(0, li.Text.IndexOf(" ")),
SpaceCamelCasing(li.Text),
macroPropTypes.Find(mpt => mpt.Id == macroPropertyTypeId));
}
}
Name = SpaceCamelCasing(li.Text),
Alias = li.Text.Substring(0, li.Text.IndexOf(" ", StringComparison.Ordinal)),
EditorAlias = macroPropertyTypeAlias
});
changed = true;
}
else if (li.Selected)
{
result += "<li>Skipped: " + SpaceCamelCasing(li.Text) + " (already exists as a parameter)</li>";
}
}
if (changed)
{
ApplicationContext.Current.Services.MacroService.Save(macroObject);
}
ChooseProperties.Visible = false;
ConfigProperties.Visible = true;
resultLiteral.Text = result;
}
private static bool MacroHasProperty(Macro macroObject, string propertyAlias)
private static bool MacroHasProperty(IMacro macroObject, string propertyAlias)
{
return macroObject.Properties.Any(mp => mp.Alias.ToLower() == propertyAlias);
}
@@ -183,31 +189,22 @@ namespace umbraco.developer
return tempString;
}
private static string FindMacroType(Hashtable macroPropertyTypes, string baseTypeName)
private static string GetMacroTypeFromClrType(string baseTypeName)
{
var tempType = "";
// Hard-code numeric values
if (baseTypeName == "Int32")
tempType = "number";
else if (baseTypeName == "Decimal")
tempType = "decimal";
else if (baseTypeName == "String")
tempType = "text";
else if (baseTypeName == "Boolean")
tempType = "bool";
else
switch (baseTypeName)
{
foreach (DictionaryEntry de in macroPropertyTypes)
{
if (de.Value.ToString() == baseTypeName)
{
tempType = de.Key.ToString();
break;
}
}
case "Int32":
return Constants.PropertyEditors.IntegerAlias;
case "Decimal":
//we previously only had an integer editor too! - this would of course
// fail if someone enters a real long number
return Constants.PropertyEditors.IntegerAlias;
case "Boolean":
return Constants.PropertyEditors.TrueFalseAlias;
case "String":
default:
return Constants.PropertyEditors.TextboxAlias;
}
return tempType;
}
}