Skip to content

Commit e2fdf43

Browse files
daniel-shuybergmania
authored andcommitted
contentpicker: Don't validate minNumber/maxNumber if 0
1 parent af942b2 commit e2fdf43

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
4545
if ($scope.contentPickerForm) {
4646
//Validate!
4747
var hasItemsOrMandatory = $scope.renderModel.length !== 0 || ($scope.model.validation && $scope.model.validation.mandatory);
48-
if (hasItemsOrMandatory && $scope.minNumberOfItems > $scope.renderModel.length) {
48+
if (hasItemsOrMandatory && $scope.minNumberOfItems && $scope.minNumberOfItems > $scope.renderModel.length) {
4949
$scope.contentPickerForm.minCount.$setValidity("minCount", false);
5050
}
5151
else {
5252
$scope.contentPickerForm.minCount.$setValidity("minCount", true);
5353
}
5454

55-
if ($scope.maxNumberOfItems < $scope.renderModel.length) {
55+
if ($scope.maxNumberOfItems && $scope.maxNumberOfItems < $scope.renderModel.length) {
5656
$scope.contentPickerForm.maxCount.$setValidity("maxCount", false);
5757
}
5858
else {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
<div class="umb-contentpicker__min-max-help" ng-if="model.config.multiPicker === true && (maxNumberOfItems > 1 || minNumberOfItems > 0) && (renderModel.length !== 0 || (model.validation && model.validation.mandatory))">
3333

3434
<!-- Both min and max items -->
35-
<span ng-if="minNumberOfItems !== maxNumberOfItems">
35+
<span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems !== maxNumberOfItems">
3636
<span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} items</span>
3737
<span ng-if="renderModel.length > maxNumberOfItems">
3838
<localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>
3939
</span>
4040
</span>
4141

4242
<!-- Equal min and max -->
43-
<span ng-if="minNumberOfItems === maxNumberOfItems">
43+
<span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems === maxNumberOfItems">
4444
<span ng-if="renderModel.length < maxNumberOfItems">Add {{minNumberOfItems - renderModel.length}} item(s)</span>
4545
<span ng-if="renderModel.length > maxNumberOfItems">
4646
<localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>

0 commit comments

Comments
 (0)