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

Don't show NC delete confirmation if an item can't be deleted

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-09-09 19:40:08 +02:00
committed by Sebastiaan Janssen
parent a51f7b29de
commit 3f4bff9ac3
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less
View File

@@ -154,6 +154,11 @@
.umb-nested-content__icon--disabled { .umb-nested-content__icon--disabled {
opacity: 0.3; opacity: 0.3;
cursor: default !important;
&:hover {
color: @ui-option-type;
}
} }

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

@@ -271,13 +271,15 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
}; };
$scope.deleteNode = function (idx) { $scope.deleteNode = function (idx) {
if ($scope.nodes.length > $scope.model.config.minItems) { $scope.nodes.splice(idx, 1);
$scope.nodes.splice(idx, 1); $scope.setDirty();
$scope.setDirty(); updateModel();
updateModel();
}
}; };
$scope.requestDeleteNode = function (idx) { $scope.requestDeleteNode = function (idx) {
if ($scope.nodes.length <= $scope.model.config.minItems) {
return;
}
if ($scope.model.config.confirmDeletes === true) { if ($scope.model.config.confirmDeletes === true) {
localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) { localizationService.localizeMany(["content_nestedContentDeleteItem", "general_delete", "general_cancel", "contentTypeEditor_yesDelete"]).then(function (data) {
const overlay = { const overlay = {