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

Fixes data type pre-value issues with MNTP, removes unecessary contentpicker.html and memberpicker.html overlays since treepicker.html is all that should be used, cleans up the treepicker one to be more inline with our current angular standards. Removes uneeded event handling from treepicker

Browse Source
This commit is contained in:
Shannon
2018-04-12 21:29:36 +10:00
parent 80d682c22a
commit fddea8c815
23 changed files with 388 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web/PropertyEditors/MultiNodePickerConfiguration.cs
View File

@@ -1,4 +1,5 @@
using Umbraco.Core.PropertyEditors;
using Newtonsoft.Json.Linq;
using Umbraco.Core.PropertyEditors;
namespace Umbraco.Web.PropertyEditors
{
@@ -8,7 +9,7 @@ namespace Umbraco.Web.PropertyEditors
public class MultiNodePickerConfiguration
{
[ConfigurationField("startNode", "Node type", "treesource")]
public string TreeSource { get; set; }
public MultiNodePickerConfigurationTreeSource TreeSource { get; set; }
[ConfigurationField("filter", "Allow items of type", "textstring", Description = "Separate with comma")]
public string Filter { get; set; }
@@ -19,7 +20,7 @@ namespace Umbraco.Web.PropertyEditors
[ConfigurationField("maxNumber", "Maximum number of items", "number")]
public int MaxNumber { get; set; }
[ConfigurationField("showOpenButtom", "Show open button (this feature is in preview!)", "boolean", Description = "Opens the node in a dialog")]
[ConfigurationField("showOpenButton", "Show open button (this feature is in preview!)", "boolean", Description = "Opens the node in a dialog")]
public bool ShowOpen { get; set; }
}
}
}

4
src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationEditor.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Web.PropertyEditors
// sanitize configuraiton
var output = base.ToConfigurationEditor(configuration);
output["multiPicker"] = configuration.MaxNumber > 1 ? "1" : "0";
output["multiPicker"] = configuration.MaxNumber > 1 ? true : false;
return output;
}
@@ -39,4 +39,4 @@ namespace Umbraco.Web.PropertyEditors
return d;
}
}
}
}

20
src/Umbraco.Web/PropertyEditors/MultiNodePickerConfigurationTreeSource.cs Normal file
View File

@@ -0,0 +1,20 @@
using Newtonsoft.Json;
namespace Umbraco.Web.PropertyEditors
{
/// <summary>
/// Represents the 'startNode' value for the <see cref="MultiNodePickerConfiguration"/>
/// </summary>
[JsonObject]
public class MultiNodePickerConfigurationTreeSource
{
[JsonProperty("type")]
public string ObjectType {get;set;}
[JsonProperty("query")]
public string StartNodeQuery {get;set;}
[JsonProperty("id")]
public int? StartNodeId {get;set;}
}
}

2
src/Umbraco.Web/Trees/DataTypeTreeController.cs
View File

@@ -17,7 +17,7 @@ using Constants = Umbraco.Core.Constants;
namespace Umbraco.Web.Trees
{
[UmbracoTreeAuthorize(Constants.Trees.DataTypes)]
[Tree(Constants.Applications.Developer, Constants.Trees.DataTypes, null, sortOrder:1)]
[Tree(Constants.Applications.Settings, Constants.Trees.DataTypes, null, sortOrder:1)]
[PluginController("UmbracoTrees")]
[CoreTree]
public class DataTypeTreeController : TreeController, ISearchableTree

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

@@ -313,6 +313,7 @@
<Compile Include="PropertyEditors\MemberPickerConfiguration.cs" />
<Compile Include="PropertyEditors\MultiNodePickerConfiguration.cs" />
<Compile Include="PropertyEditors\MultiNodePickerConfigurationEditor.cs" />
<Compile Include="PropertyEditors\MultiNodePickerConfigurationTreeSource.cs" />
<Compile Include="PropertyEditors\MultiNodeTreePickerPropertyEditor.cs" />
<Compile Include="PropertyEditors\MultipleTestStringConfiguration.cs" />
<Compile Include="PropertyEditors\MultipleTextStringConfigurationEditor.cs" />