From 21a8395142446e8b0f0ca7c90e99fc16177e869a Mon Sep 17 00:00:00 2001 From: Dave Woestenborghs Date: Wed, 18 Apr 2018 10:21:12 +0200 Subject: [PATCH 1/3] U4-11216 Multiple Content Picker allows only one item when used as macro parameter (#2593) U4-11216 set min and max number when used as parameter editor (cherry picked from commit f25233ac2b97603d633d88a4fd01dafb57f22f62) --- .../propertyeditors/contentpicker/contentpicker.controller.js | 4 ++-- .../ParameterEditors/MultipleContentPickerParameterEditor.cs | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 161f989d10..5827c046fd 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 @@ -58,7 +58,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper $scope.renderModel = []; - $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true; + $scope.dialogEditor = editorState && editorState.current && editorState.current.isDialogEditor === true; //the default pre-values var defaultConfig = { @@ -93,7 +93,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper $scope.model.config.showOpenButton = ($scope.model.config.showOpenButton === "1" ? true : false); $scope.model.config.showEditButton = ($scope.model.config.showEditButton === "1" ? true : false); $scope.model.config.showPathOnHover = ($scope.model.config.showPathOnHover === "1" ? true : false); - + var entityType = $scope.model.config.startNode.type === "member" ? "Member" : $scope.model.config.startNode.type === "media" diff --git a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs index 1fb9b267ab..27d1076352 100644 --- a/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs @@ -9,6 +9,8 @@ namespace Umbraco.Web.PropertyEditors.ParameterEditors public MultipleContentPickerParameterEditor() { Configuration.Add("multiPicker", "1"); + Configuration.Add("minNumber",0 ); + Configuration.Add("maxNumber", 0); } } -} \ No newline at end of file +} From eeaf17c857dbb0da2fb4db66f96930c8db018f33 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 12 Apr 2018 17:50:44 +0200 Subject: [PATCH 2/3] Weird revert of a PR that was merged in before (cherry picked from commit 94ed741dd51b3960e274e926daaca85183a8015e) --- .../src/views/propertyeditors/rte/rte.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index f886c60bc1..17f0f3b698 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -266,7 +266,7 @@ angular.module("umbraco") editor.on('ObjectResized', function (e) { - var qs = "?width=" + e.width + "&height=" + e.height; + var qs = "?width=" + e.width + "&height=" + e.height + "&mode=max"; var srcAttr = $(e.target).attr("src"); var path = srcAttr.split("?")[0]; $(e.target).attr("data-mce-src", path + qs); @@ -384,7 +384,7 @@ angular.module("umbraco") // element might still be there even after the modal has been hidden. $scope.$on('$destroy', function () { unsubscribe(); - if (tinyMceEditor !== undefined && tinyMceEditor != null) { + if (tinyMceEditor !== undefined && tinyMceEditor != null) { tinyMceEditor.destroy() } }); From 15eb40aedbf8d0bc07c19726433d2e80cc14e615 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 17 Apr 2018 15:07:59 +0200 Subject: [PATCH 3/3] Removed code that populates content tree with duplicate start nodes. --- src/Umbraco.Web/Trees/ContentTreeControllerBase.cs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index 99afc199c9..e8ba964f98 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -189,8 +189,7 @@ namespace Umbraco.Web.Trees { // try to parse id as an integer else use GetEntityFromId // which will grok Guids, Udis, etc and let use obtain the id - int entityId; - if (int.TryParse(id, out entityId) == false) + if (int.TryParse(id, out var entityId) == false) { var entity = GetEntityFromId(id); if (entity == null) @@ -198,15 +197,6 @@ namespace Umbraco.Web.Trees entityId = entity.Id; } - // if a request is made for the root node but user has no access to - // root node, return start nodes instead - if (entityId == Constants.System.Root && UserStartNodes.Contains(Constants.System.Root) == false) - { - return UserStartNodes.Length > 0 - ? Services.EntityService.GetAll(UmbracoObjectType, UserStartNodes) - : Enumerable.Empty(); - } - return Services.EntityService.GetChildren(entityId, UmbracoObjectType).ToArray(); }