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

Fixes deleting nodes with server validation and also ensuring that the dirty state is set on the form

Browse Source
This commit is contained in:
Shannon
2020-07-17 01:40:32 +10:00
parent d01b06bd9c
commit 0afdd69416
6 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -65,7 +65,7 @@
}
});
function NestedContentController($scope, $interpolate, $filter, $timeout, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
function NestedContentController($scope, $interpolate, $filter, serverValidationManager, contentResource, localizationService, iconHelper, clipboardService, eventsService, overlayService) {
var vm = this;
var model = $scope.$parent.$parent.model;
@@ -298,8 +298,15 @@
}
function deleteNode(idx) {
vm.nodes.splice(idx, 1);
var removed = vm.nodes.splice(idx, 1);
setDirty();
removed.forEach(x => {
// remove any server validation errors associated
serverValidationManager.removePropertyError(x.key, vm.umbProperty.property.culture, vm.umbProperty.property.segment, "", { matchType: "contains" });
});
updateModel();
validate();
};
@@ -670,8 +677,8 @@
];
this.$onInit = function () {
if (this.umbProperty) {
this.umbProperty.setPropertyActions(propertyActions);
if (vm.umbProperty) {
vm.umbProperty.setPropertyActions(propertyActions);
}
};