From a320b63fd6fd5d99e0d7b78156b0a37a25cf505a Mon Sep 17 00:00:00 2001 From: Warren Buckley Date: Mon, 10 Apr 2017 10:51:28 +0100 Subject: [PATCH] Checks that the tree has items otherwise we display the emptystate message --- .../overlays/treepicker/treepicker.controller.js | 11 ++++++++++- .../views/common/overlays/treepicker/treepicker.html | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js index df768db9cd..7ba8970294 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js @@ -20,7 +20,13 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", selectedSearchResults: [] } - $scope.model.selection = []; + $scope.model.selection = []; + + //Used for toggling an empty-state message + //Some trees can have no items (dictionary & forms email templates) + $scope.hasItems = true; + $scope.emptyStateMessage = dialogOptions.emptyStateMessage; + //TODO: I don't think this is used or called anywhere!! $scope.init = function (contentType) { @@ -149,6 +155,9 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController", //gets the tree object when it loads function treeLoadedHandler(ev, args) { + //args.tree contains children (args.tree.root.children) + $scope.hasItems = args.tree.root.children.length > 0; + tree = args.tree; } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html index 108dbdaa78..ab5e61339f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html @@ -19,8 +19,12 @@ results="searchInfo.results" select-result-callback="selectResult"> + + + {{ emptyStateMessage }} + -
+