From 205a6c2b4aaf4a37e802b76a756c6e86ec3f5f43 Mon Sep 17 00:00:00 2001
From: Per Ploug <per@umbraco.dk>
Date: Mon, 12 Oct 2015 11:39:19 +0200
Subject: [PATCH] Added folder delete to membertype delete dialog

Still needs serverside support
---
 .../views/membertypes/delete.controller.js    | 19 ++++++++-
 .../src/views/membertypes/delete.html         | 39 +++++++++++++------
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
index 061ca7eb2c..71a9786995 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js
@@ -6,7 +6,7 @@
  * @description
  * The controller for deleting content
  */
-function MemberTypesDeleteController($scope, memberTypeResource, treeService, navigationService) {
+function MemberTypesDeleteController($scope, memberTypeResource, contentTypeResource, treeService, navigationService) {
 
     $scope.performDelete = function() {
 
@@ -25,6 +25,23 @@ function MemberTypesDeleteController($scope, memberTypeResource, treeService, na
 
     };
 
+    $scope.performContainerDelete = function() {
+
+        //mark it for deletion (used in the UI)
+        $scope.currentNode.loading = true;
+        contentTypeResource.deleteContainerById($scope.currentNode.id).then(function () {
+            $scope.currentNode.loading = false;
+
+            //get the root node before we remove it
+            var rootNode = treeService.getTreeRoot($scope.currentNode);
+
+            //TODO: Need to sync tree, etc...
+            treeService.removeNode($scope.currentNode);
+            navigationService.hideMenu();
+        });
+
+    };
+
     $scope.cancel = function() {
         navigationService.hideDialog();
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
index 7da0b162c8..2b4dd8518c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
+++ b/src/Umbraco.Web.UI.Client/src/views/membertypes/delete.html
@@ -1,23 +1,38 @@
 <div class="umb-dialog umb-pane" ng-controller="Umbraco.Editors.MemberTypes.DeleteController">
     <div class="umb-dialog-body">
 
-    	<p class="umb-abstract">
-        	Are you absolutely sure you want to delete <strong>{{currentNode.name}}</strong> ?
+        <p class="umb-abstract">
+        	Are you sure you want to delete <strong>{{currentNode.name}}</strong> ?
         </p>
 
-        <p>
-        	<i class="icon-alert red"></i> <strong class="red">2345 members</strong> will be deleted permanently if you delete this member type,
-        	please confirm you want to delete these as well.
-        </p>
+        <ng-switch on="currentNode.nodeType">
+            <div ng-switch-when="container">
+                <p>This action cannot be undone, click ok to delete.</p>
 
-        <hr />
+                <umb-confirm
+                    on-confirm="performContainerDelete"
+                    on-cancel="cancel">
+                </umb-confirm>
+            </div>
 
-        <label class="checkbox">
-        		<input type="checkbox" ng-model="confirmed" /> Delete all 2345 members using {{currentNode.name}}
-        </label>
+            <div ng-switch-default>
+                <p>
+                	<i class="icon-alert red"></i> <strong class="red">All members</strong>
+                    using this member type will be deleted permanently, please confirm you want to delete these as well.
+                </p>
+
+                <hr />
+
+                <label class="checkbox">
+                	<input type="checkbox" ng-model="confirmed" />
+                    Yes, delete {{currentNode.name}} and all members using this type
+                </label>
+
+                <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">
+                </umb-confirm>
+            </div>
+        </ng-switch>
 
-        <umb-confirm ng-if="confirmed" on-confirm="performDelete" on-cancel="cancel">
-        </umb-confirm>
 
     </div>
 </div>