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

Merge branch 'dev-v8' into temp8-U4-11219

Browse Source
This commit is contained in:
Shannon
2018-04-20 00:12:31 +10:00
parent 966de9b9f4 6b12fe7c57
commit d4252a3dc8
3 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Core/Constants-PropertyEditors.cs
View File

@@ -68,12 +68,7 @@ namespace Umbraco.Core
/// DropDown List.
/// </summary>
public const string DropDownListFlexible = "Umbraco.DropDown.Flexible";
/// <summary>
/// Folder Browser.
/// </summary>
public const string FolderBrowser = "Umbraco.FolderBrowser";
/// <summary>
/// Grid.
/// </summary>
@@ -193,17 +188,7 @@ namespace Umbraco.Core
/// Upload Field.
/// </summary>
public const string UploadField = "Umbraco.UploadField";
/// <summary>
/// XPatch Checkbox List.
/// </summary>
public const string XPathCheckBoxList = "Umbraco.XPathCheckBoxList";
/// <summary>
/// XPath DropDown List.
/// </summary>
public const string XPathDropDownList = "Umbraco.XPathDropDownList";
/// <summary>
/// Email Address.
/// </summary>

21
src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
View File

@@ -1,16 +1,25 @@
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors.ParameterEditors
{
[ParameterEditor(Constants.PropertyEditors.MultiNodeTreePickerAlias, "Multiple Content Picker", "contentpicker")]
public class MultipleContentPickerParameterEditor : ParameterEditor
/// <summary>
/// Represents a parameter editor of some sort.
/// </summary>
[DataEditor(Constants.PropertyEditors.Aliases.MultiNodeTreePicker, EditorType.MacroParameter, "Multiple Content Picker", "contentpicker")]
public class MultipleContentPickerParameterEditor : DataEditor
{
public MultipleContentPickerParameterEditor()
/// <summary>
/// Initializes a new instance of the <see cref="MultipleContentPickerParameterEditor"/> class.
/// </summary>
public MultipleContentPickerParameterEditor(ILogger logger)
: base(logger)
{
Configuration.Add("multiPicker", "1");
Configuration.Add("minNumber",0 );
Configuration.Add("maxNumber", 0);
// configure
DefaultConfiguration.Add("multiPicker", "1");
DefaultConfiguration.Add("minNumber",0 );
DefaultConfiguration.Add("maxNumber", 0);
}
}
}

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -315,6 +315,7 @@
<Compile Include="PropertyEditors\NestedContentConfigurationEditor.cs" />
<Compile Include="PropertyEditors\NestedContentController.cs" />
<Compile Include="PropertyEditors\NestedContentPropertyEditor.cs" />
<Compile Include="PropertyEditors\ParameterEditors\MultipleContentPickerParameterEditor.cs" />
<Compile Include="PropertyEditors\PropertyEditorsComponent.cs" />
<Compile Include="PropertyEditors\RelatedLinksPropertyEditor.cs" />
<Compile Include="PropertyEditors\RelatedLinksConfiguration.cs" />