diff --git a/src/Umbraco.Core/Models/DataTypeDefinition.cs b/src/Umbraco.Core/Models/DataTypeDefinition.cs index 8fcc8b6a13..4f2eb56b04 100644 --- a/src/Umbraco.Core/Models/DataTypeDefinition.cs +++ b/src/Umbraco.Core/Models/DataTypeDefinition.cs @@ -191,7 +191,7 @@ namespace Umbraco.Core.Models return _propertyEditorAlias; }, _propertyEditorAlias, PropertyEditorAliasSelector); //This is a custom property that is not exposed in IUmbracoEntity so add it to the additional data - AdditionalData["DatabaseType"] = value; + _additionalData["DatabaseType"] = value; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/propertyeditors/package.manifest b/src/Umbraco.Web.UI.Client/src/packages/propertyeditors/package.manifest index 4b2941b803..5c1a7cb7a9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/propertyeditors/package.manifest +++ b/src/Umbraco.Web.UI.Client/src/packages/propertyeditors/package.manifest @@ -1,29 +1,5 @@ { propertyEditors: [ - { - alias: "MyPackage.MNTP", - name: "Multinode treepicker", - editor: { - view: "~/App_Plugins/propertyeditors/mntp/mntp.html" - }, - - prevalues: { - fields: [ - { - label: "Multipicker", - key: "multi", - view: "boolean" - } - ] - } - }, - { - alias: "MyPackage.RelatedLinks", - name: "Related links", - editor: { - view: "~/App_Plugins/propertyeditors/relatedlinks/relatedlinks.html" - } - }, { alias: "MyPackage.Boolean", name: "Boolean", diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js index 5005d329b1..0f7a64456a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js @@ -1,28 +1,81 @@ //used for the media picker dialog angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", - function ($scope, eventsService, $log) { + function ($scope, entityResource, eventsService, $log, searchService) { var dialogOptions = $scope.$parent.dialogOptions; $scope.dialogTreeEventHandler = $({}); $scope.section = dialogOptions.section; $scope.treeAlias = dialogOptions.treeAlias; + //search defaults + $scope.searcher = searchService.searchContent; + $scope.entityType ="Document"; + $scope.results = []; + + if(dialogOptions.treeAlias === "member"){ + $scope.searcher = searchService.searchMembers; + $scope.entityType = "Member"; + }else if(dialogOptions.treeAlias === "media"){ + $scope.searcher = searchService.searchMedia; + $scope.entityType = "Media"; + } + + function select(id){ + entityResource.getById(id, $scope.entityType).then(function(ent){ + if(dialogOptions && dialogOptions.multiPicker){ + + $scope.showSearch = false; + $scope.results = []; + $scope.term = ""; + $scope.oldTerm = undefined; + + $scope.select(ent); + }else{ + $scope.submit(ent); + } + }); + } + + $scope.selectResult = function(result){ + select(result.id); + }; + + $scope.performSearch = function(){ + if($scope.term){ + if($scope.oldTerm !== $scope.term){ + $scope.results = []; + + $scope.searcher.call(null, {term: $scope.term, results: $scope.results}); + + $scope.showSearch = true; + $scope.oldTerm = $scope.term; + } + }else{ + $scope.oldTerm = ""; + $scope.showSearch = false; + $scope.results = []; + } + }; $scope.dialogTreeEventHandler.bind("treeNodeSelect", function(ev, args){ args.event.preventDefault(); args.event.stopPropagation(); eventsService.publish("Umbraco.Dialogs.TreePickerController.Select", args).then(function(args){ - if(dialogOptions && dialogOptions.multipicker){ - $(args.event.target.parentElement) - .find("i.umb-tree-icon") - .attr("class", "icon umb-tree-icon sprTree icon-check blue"); - - $scope.select(args.node); - }else{ - $scope.submit(args.node); - } - }); + select(args.node.id); + if(dialogOptions && dialogOptions.multiPicker){ + var c = $(args.event.target.parentElement); + if(!args.node.selected){ + args.node.selected = true; + c.find("i.umb-tree-icon").hide() + .after(""); + }else{ + args.node.selected = false; + c.find(".temporary").remove(); + c.find("i.umb-tree-icon").show(); + } + } + }); }); }); \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html index 205d8548cc..7c75ec69e3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.html @@ -1,7 +1,42 @@
-
+
+
+
+ + +
+
+
+
-
+ + + +
-
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html new file mode 100644 index 0000000000..f489415350 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/nodetype.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html index 5acfbbf583..e489a6db4e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textarea.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html new file mode 100644 index 0000000000..8fcfc8b5c6 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/textstring.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 7928c1a9ed..57416a64c2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -5,11 +5,12 @@ angular.module('umbraco') function($scope, dialogService, entityResource, $log, iconHelper){ $scope.ids = $scope.model.value.split(','); - $scope.renderModel = []; - $scope.cfg = {multipicker: false}; - if($scope.config){ - $scope.cfg = $scope.config; + $scope.renderModel = []; + $scope.cfg = {multipicker: false, type: "content", filter: ""}; + + if($scope.model.config){ + $scope.cfg = $scope.model.config; } entityResource.getByIds($scope.ids, "Document").then(function(data){ @@ -20,7 +21,13 @@ angular.module('umbraco') }); $scope.openContentPicker =function(){ - var d = dialogService.contentPicker({scope: $scope, multipicker: $scope.cfg.multipicker, callback: populate}); + var d = dialogService.treePicker({ + section: $scope.cfg.type, + treeAlias: $scope.cfg.type, + scope: $scope, + multiPicker: $scope.cfg.multiPicker, + filter: $scope.cfg.filter, + callback: populate}); }; $scope.remove =function(index){ diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config index acafac91f1..46a523ce38 100644 --- a/src/Umbraco.Web.UI/config/trees.config +++ b/src/Umbraco.Web.UI/config/trees.config @@ -39,5 +39,4 @@ - \ No newline at end of file diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodePreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodePreValueEditor.cs new file mode 100644 index 0000000000..1426a552e3 --- /dev/null +++ b/src/Umbraco.Web/PropertyEditors/MultiNodePreValueEditor.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Umbraco.Core.PropertyEditors; + +namespace Umbraco.Web.PropertyEditors +{ + public class MultiNodePickerPreValueEditor : PreValueEditor + { + [PreValueField("multiPicker", "Pick multiple items", "views/prevalueEditors/boolean.html")] + public bool MultiPicker { get; set; } + + [PreValueField("type", "Type", "views/prevalueEditors/nodetype.html")] + public string Type { get; set; } + + [PreValueField("filter", "Filter by content type", "views/prevalueEditors/textstring.html", Description = "Seperate with comma")] + public string Filter { get; set; } + + } +} diff --git a/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs new file mode 100644 index 0000000000..9b0f083a0b --- /dev/null +++ b/src/Umbraco.Web/PropertyEditors/MultiNodeTreePickerPropertyEditor.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Umbraco.Core; +using Umbraco.Core.PropertyEditors; + +namespace Umbraco.Web.PropertyEditors +{ + [PropertyEditor(Constants.PropertyEditors.MultiNodeTreePickerAlias, "Multinode Treepicker", "contentpicker")] + public class MultiNodeTreePickerPropertyEditor : PropertyEditor + { + + protected override PreValueEditor CreatePreValueEditor() + { + return new MultiNodePickerPreValueEditor(); + } + } +} diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index b4108ad386..884d6637fb 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -332,6 +332,8 @@ + +