yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contentpicker: Don't validate minNumber/maxNumber if 0

Browse Source
This commit is contained in:
Daniel Shuy
2021-11-15 23:25:32 +08:00
committed by Bjarke Berg
parent af942b2558
commit e2fdf43a7f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,14 +45,14 @@ function contentPickerController($scope, $q, $routeParams, $location, entityReso
if ($scope.contentPickerForm) { if ($scope.contentPickerForm) {
//Validate! //Validate!
var hasItemsOrMandatory = $scope.renderModel.length !== 0 || ($scope.model.validation && $scope.model.validation.mandatory); var hasItemsOrMandatory = $scope.renderModel.length !== 0 || ($scope.model.validation && $scope.model.validation.mandatory);
if (hasItemsOrMandatory && $scope.minNumberOfItems > $scope.renderModel.length) { if (hasItemsOrMandatory && $scope.minNumberOfItems && $scope.minNumberOfItems > $scope.renderModel.length) {
$scope.contentPickerForm.minCount.$setValidity("minCount", false); $scope.contentPickerForm.minCount.$setValidity("minCount", false);
} }
else { else {
$scope.contentPickerForm.minCount.$setValidity("minCount", true); $scope.contentPickerForm.minCount.$setValidity("minCount", true);
} }
if ($scope.maxNumberOfItems < $scope.renderModel.length) { if ($scope.maxNumberOfItems && $scope.maxNumberOfItems < $scope.renderModel.length) {
$scope.contentPickerForm.maxCount.$setValidity("maxCount", false); $scope.contentPickerForm.maxCount.$setValidity("maxCount", false);
} }
else { else {

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
View File

@@ -32,7 +32,7 @@
<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))"> <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))">
<!-- Both min and max items --> <!-- Both min and max items -->
<span ng-if="minNumberOfItems !== maxNumberOfItems"> <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems !== maxNumberOfItems">
<span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} items</span> <span ng-if="renderModel.length < maxNumberOfItems">Add between {{minNumberOfItems}} and {{maxNumberOfItems}} items</span>
<span ng-if="renderModel.length > maxNumberOfItems"> <span ng-if="renderModel.length > maxNumberOfItems">
<localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize> <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>
@@ -40,7 +40,7 @@
</span> </span>
<!-- Equal min and max --> <!-- Equal min and max -->
<span ng-if="minNumberOfItems === maxNumberOfItems"> <span ng-if="minNumberOfItems && maxNumberOfItems && minNumberOfItems === maxNumberOfItems">
<span ng-if="renderModel.length < maxNumberOfItems">Add {{minNumberOfItems - renderModel.length}} item(s)</span> <span ng-if="renderModel.length < maxNumberOfItems">Add {{minNumberOfItems - renderModel.length}} item(s)</span>
<span ng-if="renderModel.length > maxNumberOfItems"> <span ng-if="renderModel.length > maxNumberOfItems">
<localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize> <localize key="validation_maxCount">You can only have</localize> {{maxNumberOfItems}} <localize key="validation_itemsSelected"> items selected</localize>