Skip to content

Commit 4dd663d

Browse files
BatJannul800sebastiaan
authored andcommitted
Add remove warning
1 parent 2b6e4ce commit 4dd663d

File tree

7 files changed

+47
-7
lines changed

7 files changed

+47
-7
lines changed

src/Umbraco.Web.UI.Client/src/common/directives/components/umbchildselector.directive.js

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,38 @@ Use this directive to render a ui component for selecting child items to a paren
118118
(function() {
119119
'use strict';
120120

121-
function ChildSelectorDirective() {
121+
function ChildSelectorDirective(overlayService, localizationService) {
122122

123123
function link(scope, el, attr, ctrl) {
124124

125125
var eventBindings = [];
126126
scope.dialogModel = {};
127127
scope.showDialog = false;
128128

129-
scope.removeChild = (selectedChild, $index) => {
130-
if (scope.onRemove) {
131-
scope.onRemove(selectedChild, $index);
132-
}
129+
scope.removeChild = (selectedChild, $index, event) => {
130+
const dialog = {
131+
view: "views/components/overlays/umb-template-remove-confirm.html",
132+
layout: selectedChild,
133+
submitButtonLabelKey: "defaultdialogs_yesRemove",
134+
submitButtonStyle: "danger",
135+
submit: function () {
136+
if(scope.onRemove) {
137+
scope.onRemove(selectedChild, $index);
138+
overlayService.close();
139+
}
140+
},
141+
close: function () {
142+
overlayService.close();
143+
}
144+
};
145+
146+
localizationService.localize("general_delete").then(value => {
147+
dialog.title = value;
148+
overlayService.open(dialog);
149+
});
150+
151+
event.preventDefault();
152+
event.stopPropagation();
133153
};
134154

135155
scope.addChild = $event => {
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div>
2+
3+
<div ng-if="model.layout" class="umb-alert umb-alert--warning mb2">
4+
<localize key="contentTypeEditor_removeChildNode">You are removing the child node</localize> <strong>{{model.layout.name}}</strong>.
5+
</div>
6+
7+
<p>
8+
<localize key="contentTypeEditor_removeChildNodeWarning">
9+
Removing a child node will limit the editors options to create different content types beneath a node.
10+
</localize>
11+
</p>
12+
13+
<localize key="defaultdialogs_confirmdelete">Are you sure you want to remove</localize>?
14+
15+
</div>

src/Umbraco.Web.UI.Client/src/views/components/umb-child-selector.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<span class="umb-child-selector__child-name">{{selectedChild.name}}</span>
2525
</div>
2626
<div class="umb-child-selector__child-actions">
27-
<button type="button" class="umb-node-preview__action umb-node-preview__action--red umb-child-selector__child-remove" ng-click="removeChild(selectedChild, $index)">
27+
<button type="button" class="umb-node-preview__action umb-node-preview__action--red umb-child-selector__child-remove" ng-click="removeChild(selectedChild, $index, $event)">
2828
<localize key="general_remove">Remove</localize>
2929
</button>
3030
</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.prevalues.controller.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ angular.module("umbraco")
188188
}
189189

190190
function deleteLayout(layout, index, event) {
191-
192191
const dialog = {
193192
view: "views/propertyEditors/grid/overlays/rowdeleteconfirm.html",
194193
layout: layout,

src/Umbraco.Web.UI/Umbraco/config/lang/da.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1531,6 +1531,8 @@ Mange hilsner fra Umbraco robotten
15311531
<key alias="propertyHasChanges">Du har lavet ændringer til denne egenskab. Er du sikker på at du vil kassere dem?</key>
15321532
<key alias="displaySettingsHeadline">Visning</key>
15331533
<key alias="displaySettingsLabelOnTop">Label hen over (fuld bredde)</key>
1534+
<key alias="removeChildNode">Du fjerner noden</key>
1535+
<key alias="removeChildNodeWarning">Fjernelse af noden, begrænser redaktørens muligheder for at oprette forskellige typer af underindhold.</key>
15341536
</area>
15351537
<area alias="languages">
15361538
<key alias="addLanguage">Tilføj sprog</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
17171717
<key alias="propertyHasChanges">You have made changes to this property. Are you sure you want to discard them?</key>
17181718
<key alias="displaySettingsHeadline">Appearance</key>
17191719
<key alias="displaySettingsLabelOnTop">Label above (full-width)</key>
1720+
<key alias="removeChildNode">You are removing the child node</key>
1721+
<key alias="removeChildNodeWarning">Removing a child node will limit the editors options to create different content types beneath a node.</key>
17201722
</area>
17211723
<area alias="languages">
17221724
<key alias="addLanguage">Add language</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,8 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
17481748
<key alias="addTab">Add tab</key>
17491749
<key alias="convertToTab">Convert to tab</key>
17501750
<key alias="tabDirectPropertiesDropZone">Drag properties here to place directly on the tab</key>
1751+
<key alias="removeChildNode">You are removing the child node</key>
1752+
<key alias="removeChildNodeWarning">Removing a child node will limit the editors options to create different content types beneath a node.</key>
17511753
</area>
17521754
<area alias="languages">
17531755
<key alias="addLanguage">Add language</key>

0 commit comments

Comments
 (0)