From 4fea694c6a5be9be011f82519581d1567fed114f Mon Sep 17 00:00:00 2001 From: perploug Date: Mon, 18 Nov 2013 22:29:19 +0100 Subject: [PATCH] Loads content and media trees with a custom root --- .../common/directives/umbtree.directive.js | 3 +- .../src/common/resources/tree.resource.js | 6 +++- .../common/dialogs/treepicker.controller.js | 1 + .../src/views/common/dialogs/treepicker.html | 6 ++-- .../prevalueeditors/treesource.controller.js | 12 +++---- .../src/views/prevalueeditors/treesource.html | 32 ++++++++++--------- .../Trees/ContentTreeControllerBase.cs | 8 +++++ src/Umbraco.Web/Trees/TreeControllerBase.cs | 1 + .../Trees/TreeQueryStringParameters.cs | 1 + 9 files changed, 45 insertions(+), 25 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js index abf22e5979..829ca0978b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js @@ -17,6 +17,7 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat showheader: '@', cachekey: '@', isdialog: '@', + rootnodeid: '@', eventhandler: '=' }, @@ -219,7 +220,7 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat //anytime we want to load the tree we need to disable the delete animations deleteAnimations = false; - treeService.getTree({ section: scope.section, tree: scope.treealias, cacheKey: scope.cachekey, isDialog: scope.isdialog ? scope.isdialog : false }) + treeService.getTree({ section: scope.section, tree: scope.treealias, cacheKey: scope.cachekey, isDialog: scope.isdialog ? scope.isdialog : false, rootNodeId: scope.rootnodeid ? scope.rootnodeid : -1 }) .then(function(data) { //set the data once we have it scope.tree = data; diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js index d004262fe3..91cd883203 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/tree.resource.js @@ -45,6 +45,9 @@ function treeResource($q, $http, umbRequestHelper) { if (!options.isDialog) { options.isDialog = false; } + if (!options.rootNodeId) { + options.rootNodeId = -1; + } return umbRequestHelper.resourcePromise( $http.get( @@ -54,7 +57,8 @@ function treeResource($q, $http, umbRequestHelper) { [ {application: options.section}, { tree: options.tree }, - { isDialog: options.isDialog } + { isDialog: options.isDialog }, + { rootNodeId: options.rootNodeId }, ])), 'Failed to retreive data for application tree ' + options.section); }, 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 6030a52629..41962b3f86 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 @@ -7,6 +7,7 @@ angular.module("umbraco").controller("Umbraco.Dialogs.TreePickerController", $scope.section = dialogOptions.section; $scope.treeAlias = dialogOptions.treeAlias; $scope.multiPicker = dialogOptions.multiPicker; + $scope.rootNodeId = dialogOptions.rootNodeId; //search defaults $scope.searcher = searchService.searchContent; 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 0f0a91c382..f788e86ff5 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,5 +1,5 @@
-
+
@@ -11,8 +11,9 @@
-
+
+
    @@ -39,6 +40,7 @@ showheader="true" showoptions="false" isdialog="true" + rootnodeid="{{rootNodeId}}" eventhandler="dialogTreeEventHandler">
diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js index 940a45434a..3f353a9d4f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js @@ -12,16 +12,12 @@ angular.module('umbraco') $scope.model.type = "content"; } - - - if($scope.model.id){ + if($scope.model.id && $scope.model.type !== "member"){ var ent = "Document"; if($scope.model.type === "media"){ ent = "Media"; - }else if ($scope.model.type === "member"){ - ent = "Member"; } - + entityResource.getById($scope.model.id, ent).then(function(item){ item.icon = iconHelper.convertFromLegacyIcon(item.icon); $scope.node = item; @@ -44,6 +40,10 @@ angular.module('umbraco') }; $scope.$on("formSubmitting", function (ev, args) { + if($scope.model.type === "member"){ + $scope.model.id = -1; + } + $scope.model.value = {type: $scope.model.type, id: $scope.model.id}; }); diff --git a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html index c8021fcb4f..370a2c8cd6 100644 --- a/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html +++ b/src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.html @@ -8,20 +8,22 @@

- +
+ - + +
\ No newline at end of file diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index 82d9fcb9b2..04addf4fb7 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -8,6 +8,7 @@ using Umbraco.Core.Models.EntityBase; using Umbraco.Web.Models.Trees; using umbraco; using umbraco.BusinessLogic.Actions; +using System.Globalization; namespace Umbraco.Web.Trees { @@ -65,6 +66,13 @@ namespace Umbraco.Web.Trees { if (id == Constants.System.Root.ToInvariantString() && UserStartNode == Constants.System.Root) { + if (queryStrings.HasKey(TreeQueryStringParameters.RootNode) && queryStrings.GetValue(TreeQueryStringParameters.RootNode) != Constants.System.Root.ToString(CultureInfo.InvariantCulture)) + id = queryStrings.GetValue(TreeQueryStringParameters.RootNode); + + /* if (Security.CurrentUser.HasPathAccess(c)) + node = CreateCustomRootNode(queryStrings, c.Id, c.ParentId, c.Name); + */ + //we need to append the recycle bin to the end (if not in dialog mode) var nodes = PerformGetTreeNodes(id, queryStrings); diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs index e31cb85b0d..91e253841f 100644 --- a/src/Umbraco.Web/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs @@ -7,6 +7,7 @@ using Umbraco.Core.Events; using Umbraco.Web.Models.Trees; using Umbraco.Web.WebApi; using Umbraco.Web.WebApi.Filters; +using Umbraco.Core.Models; namespace Umbraco.Web.Trees { diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs index 2bbbcf0a1a..c6aa63a200 100644 --- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs +++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs @@ -7,6 +7,7 @@ { public const string IsDialog = "isDialog"; public const string Application = "application"; + public const string RootNode = "rootNodeId"; //public const string OnNodeClick = "OnNodeClick"; //public const string RenderParent = "RenderParent"; }