Skip to content

V10: 13099 fix validation error #13170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madsrasmussen merged 2 commits into from
Oct 11, 2022
Merged

V10: 13099 fix validation error #13170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed70acf
Add validation error message to Viewpicker
Zeegaan Oct 11, 2022
cd8fe5a
Add help-inline class to make validation-text red
Zeegaan Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<ng-form name="propertyEditorForm">

<div
ng-model="model.content.selectedEditor"
name="selectedEditor"
<div
ng-model="model.content.selectedEditor"
name="selectedEditor"
val-require-component
class="umb-property-editor--limit-width">

Expand All @@ -23,7 +23,7 @@
ng-click="vm.openPropertyEditorPicker()">
</umb-button>

<div ng-messages="propertyEditorForm.selectedEditor.$error" show-validation-on-submit>
<div class="help-inline" ng-messages="propertyEditorForm.selectedEditor.$error" show-validation-on-submit>
<span ng-message="valRequiredComponent">
<localize key="general_required">Required</localize>
</span>
Expand Down
8 changes: 4 additions & 4 deletions src/Umbraco.Web.UI.Client/src/views/macros/views/macro.settings.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ function MacrosSettingsController($scope, editorService, localizationService) {
//vm.removeMacroView = removeMacroView;
$scope.model.openViewPicker = openViewPicker;
$scope.model.removeMacroView = removeMacroView;

var labels = {};

vm.macroPartialViewPickerProperty = { alias : "macroPartialViewPickerProperty", description: "", label: "Macro partial view", validation: {mandatory : true}}
localizationService.localizeMany(["macro_selectViewFile"]).then(function(data) {
labels.selectViewFile = data[0];
vm.macroPartialViewPickerProperty.description = data[0];
});

function openViewPicker() {
Expand All @@ -45,7 +45,7 @@ function MacrosSettingsController($scope, editorService, localizationService) {
name: $scope.model.macro.view
};

//$scope.model.submit($scope.model);
//$scope.model.submit($scope.model);

editorService.close();
},
Expand All @@ -63,7 +63,7 @@ function MacrosSettingsController($scope, editorService, localizationService) {
}

function init() {

}

init();
Expand Down
15 changes: 10 additions & 5 deletions src/Umbraco.Web.UI.Client/src/views/macros/views/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
<div class="umb-package-details__main-content">

<umb-box>
<umb-box-header title="Macro partial view"></umb-box-header>
<umb-box-content>
<umb-control-group label="Macro partial view" required="true" hide-label="true">

<umb-property property="vm.macroPartialViewPickerProperty">
<ng-form name="vm.macroPartialViewPickerForm">
<umb-node-preview
ng-if="model.macro.node"
icon="model.macro.node.icon"
Expand All @@ -19,7 +18,7 @@
on-remove="model.removeMacroView()">
</umb-node-preview>

<input type="hidden" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />
<input type="hidden" name="partialView" ng-model="mandatoryViewValidator" ng-required="!model.macro.node" />

<button type="button"
class="umb-node-preview-add"
Expand All @@ -28,7 +27,13 @@
<localize key="general_add">Add</localize>
</button>

</umb-control-group>
<div class="help-inline" ng-messages="vm.macroPartialViewPickerForm.partialView.$error" show-validation-on-submit>
<span ng-message="required">
<localize key="general_required">Required</localize>
</span>
</div>
</ng-form>
</umb-property>
</umb-box-content>
</umb-box>
<umb-box>
Expand Down