From d5baa586cfde13e017f5db8dd7ab0dc36d5de4fa Mon Sep 17 00:00:00 2001 From: Robert Foster Date: Sat, 20 Jun 2015 09:37:20 +1000 Subject: [PATCH] Adds the ability to provide the Entity Type to the treepicker dialog controller rather than just guessing from the type. This allows other types than just Document, Media or Member to be picked properly without errors. Also fixed treepicker prevallue controller to pass in treeAlias properly to treepicker dialog. --- .../src/views/common/dialogs/treepicker.controller.js | 3 ++- .../src/views/prevalueeditors/treepicker.controller.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 ef64247613..2d8d38cf50 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 @@ -26,7 +26,8 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", searchText = value + "..."; }); - var entityType = "Document"; + // Allow the entity type to be passed in but defaults to Document for backwards compatibility. + var entityType = dialogOptions.entityType ? dialogOptions.entityType : "Document"; //min / max values diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js index 7bb02ba751..91a228267b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treepicker.controller.js @@ -29,7 +29,7 @@ angular.module('umbraco') $scope.openContentPicker =function() { var d = dialogService.treePicker({ section: config.type, - treeAlias: config.type, + treeAlias: config.treeAlias, multiPicker: config.multiPicker, callback: populate });