From adeb8fc1f70abccf2aa2b361eaefd1e07da4183c Mon Sep 17 00:00:00 2001 From: Kenn Jacobsen Date: Wed, 4 Sep 2019 14:47:19 +0200 Subject: [PATCH] Fix mandatory validation clientside for content picker and MNTP --- .../contentpicker/contentpicker.controller.js | 6 ++++++ 1 file changed, 6 insertions(+) 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 6667c3b539..be99ffe8f9 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 @@ -117,6 +117,12 @@ function contentPickerController($scope, entityResource, editorState, iconHelper } //merge the server config on top of the default config, then set the server config to use the result $scope.model.config = angular.extend(defaultConfig, $scope.model.config); + + // if the property is mandatory, set the minCount config to 1 (unless of course it is set to something already), + // that way the minCount/maxCount validation handles the mandatory as well + if ($scope.model.validation && $scope.model.validation.mandatory && !$scope.model.config.minNumber) { + $scope.model.config.minNumber = 1; + } } //Umbraco persists boolean for prevalues as "0" or "1" so we need to convert that!