From 3f8dffee3fa22a0e36506724165cf02790f2fee0 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <post@kennjacobsen.dk>
Date: Thu, 29 Aug 2019 13:41:34 +0200
Subject: [PATCH] V7: Add confirmation when deleting content and media (#6004)

---
 .../content/content.delete.controller.js      |  2 +-
 .../src/views/content/delete.html             | 22 ++++++++++++++-----
 .../src/views/media/delete.html               | 21 +++++++++++++-----
 .../views/media/media.delete.controller.js    |  3 +--
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  1 +
 .../umbraco/config/lang/en_us.xml             |  1 +
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
index 917e4c024a..b12d809aaa 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
@@ -50,7 +50,7 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
+            $scope.success = true;
         }, function(err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/delete.html b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
index f3bdb0d121..1eb0363c34 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/delete.html
@@ -1,12 +1,22 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Content.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
-        </umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel">    
+            </umb-confirm>
+        </div>
 
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/delete.html b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
index 3c9716eb3f..9fca0c9222 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/delete.html
@@ -1,10 +1,21 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.Media.DeleteController">
     <div class="umb-dialog-body" auto-scale="90">
-        
-        <p class="umb-abstract">
-            <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
-        </p>
 
-        <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        <div ng-show="success">
+            <div class="alert alert-success">
+                <strong>{{currentNode.name}}</strong>
+                <localize key="actions_wasDeleted">was deleted</localize>
+            </div>
+            <button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
+        </div>
+
+        <div ng-hide="success">
+            <p class="umb-abstract">
+                <localize key="defaultdialogs_confirmdelete">Are you sure you want to delete</localize> <strong>{{currentNode.name}}</strong> ?
+            </p>
+
+            <umb-confirm on-confirm="performDelete" on-cancel="cancel"></umb-confirm>
+        </div>
+
     </div>
 </div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
index 6ff35ab9cb..c3b3e0c116 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
@@ -50,8 +50,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
                 $location.path(location);
             }
 
-            navigationService.hideMenu();
-
+            $scope.success = true;
         }, function (err) {
 
             $scope.currentNode.loading = false;
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index 3223478dd7..b0b8dc67e1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -37,6 +37,7 @@
     <key alias="toInTheTreeStructureBelow">til i træstrukturen nedenfor</key>
     <key alias="wasMovedTo">blev flyttet til</key>
     <key alias="wasCopiedTo">blev kopieret til</key>
+    <key alias="wasDeleted">blev slettet</key>
     <key alias="rights">Rettigheder</key>
     <key alias="rollback">Fortryd ændringer</key>
     <key alias="sendtopublish">Send til udgivelse</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 53a58bd7b1..a3f098d20f 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index a2b7e6d040..3e947f3589 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -38,6 +38,7 @@
         <key alias="toInTheTreeStructureBelow">to in the tree structure below</key>
         <key alias="wasMovedTo">was moved to</key>
         <key alias="wasCopiedTo">was copied to</key>
+        <key alias="wasDeleted">was deleted</key>
         <key alias="rights">Permissions</key>
         <key alias="rollback">Rollback</key>
         <key alias="sendtopublish">Send To Publish</key>