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

Merge pull request #7690 from nathanwoulfe/fix-regression-from-validation-changes

Browse Source 
Fix regression from valpropertymsg directive changes
This commit is contained in:
Poornima Nayar
2020-02-20 09:38:59 +00:00
committed by GitHub
parent 64cffcb967 65750d2b32
commit 366b4fc70d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
View File

@@ -39,7 +39,9 @@ function valPropertyMsg(serverValidationManager, localizationService) {
scope.currentProperty = currentProperty;
var currentCulture = currentProperty.culture;
var isMandatory = currentProperty.validation.mandatory;
// validation object won't exist when editor loads outside the content form (ie in settings section when modifying a content type)
var isMandatory = currentProperty.validation ? currentProperty.validation.mandatory : undefined;
var labels = {};
localizationService.localize("errors_propertyHasErrors").then(function (data) {
@@ -141,7 +143,7 @@ function valPropertyMsg(serverValidationManager, localizationService) {
else if (_.without(_.keys(formCtrl.$error), "valPropertyMsg").length > 0) {
// errors exist, but if the property is NOT mandatory and has no value, the errors should be cleared
if (!isMandatory && !currentProperty.value) {
if (isMandatory !== undefined && isMandatory === false && !currentProperty.value) {
hasError = false;
showValidation = false;
scope.errorMsg = "";