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

Only show server-side validation errors if the languages are checked for publish/schedule

Browse Source
This commit is contained in:
Robert
2019-03-19 15:03:07 +01:00
parent aa6e0ce0c2
commit e9ecb4c998
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
View File

@@ -42,7 +42,7 @@
<div class="umb-list-item umb-list--condensed"
ng-repeat="variant in vm.variants">
<ng-form name="publishVariantSelectorForm">
<div class="flex" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid}">
<div class="flex">
<umb-checkbox
input-id="{{variant.htmlId}}"
@@ -52,15 +52,15 @@
server-validation-field="{{variant.htmlId}}"/>
<div>
<label for="{{variant.htmlId}}" style="margin-bottom: 0;">
<label for="{{variant.htmlId}}" style="margin-bottom: 0;" ng-class="{'umb-list-item--error': publishVariantSelectorForm.publishVariantSelector.$invalid && variant.save}">
<span>{{ variant.language.name }}</span>
<span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
<span class="db umb-permission__description" ng-if="(!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
</span>
<span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
<span ng-if="variant.save" class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
<span class="db umb-permission__description text-error" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
</span>

8
src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html
View File

@@ -86,7 +86,7 @@
<div class="umb-list-item" ng-repeat="variant in vm.variants | filter:vm.dirtyVariantFilter">
<ng-form name="scheduleSelectorForm">
<div class="flex" ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid}">
<div class="flex">
<umb-checkbox
input-id="{{'saveVariantSelector_' + variant.language.culture}}"
@@ -96,11 +96,11 @@
<div>
<label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
<label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px; " ng-class="{'umb-list-item--error': scheduleSelectorForm.saveVariantReleaseDate.$invalid && variant.save}">
<span>{{ variant.language.name }}</span>
<span class="db umb-permission__description"
ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
ng-if="(!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)) || variant.save === false">
<umb-variant-state variant="variant"></umb-variant-state>
<span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
</span>
@@ -166,7 +166,7 @@
name="saveVariantReleaseDate"
val-server-field="{{variant.htmlId}}" />
<div ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
<div ng-if="variant.save" ng-messages="scheduleSelectorForm.saveVariantReleaseDate.$error" show-validation-on-submit>
<div class="umb-permission__description text-error" ng-message="valServerField">{{scheduleSelectorForm.saveVariantReleaseDate.errorMsg}}</div>
</div>