From 8d74ae342e61cad843c68ecf819d663a2d3f4777 Mon Sep 17 00:00:00 2001
From: "michal.kovacik" <mikovaci@cisco.com>
Date: Thu, 24 Nov 2016 11:31:43 +0100
Subject: [PATCH] Yangman - re-enable delete button after previous deletion

Change-Id: Iafec55e1979d67ecb67114422ee1fe3dd0923a75
Signed-off-by: michal.kovacik <mikovaci@cisco.com>
---
 .../controllers/requests-list.controller.js   | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
index 2118e8fe..7f3c99c1 100644
--- a/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
+++ b/modules/yangman-resources/src/main/resources/yangman/controllers/requests-list.controller.js
@@ -88,14 +88,13 @@ define([
                 .ok($filter('translate')('YANGMAN_OK'))
                 .cancel($filter('translate')('YANGMAN_CANCEL'));
 
-            $mdDialog.show(confirm).then(function (){
+            $mdDialog.show(confirm)
+            .then(function (){
                 vm.requestList.clear();
                 vm.requestList.saveToStorage();
                 loadHistoryList();
-                YangmanDesignService.enableMdMenuItem(event);
-            }, function (){
-                YangmanDesignService.enableMdMenuItem(event);
-            });
+            })
+            .then(YangmanDesignService.enableMdMenuItem(event));
         }
 
         /**
@@ -112,14 +111,13 @@ define([
 
             YangmanDesignService.disableMdMenuItem(event);
 
-            $mdDialog.show(confirm).then(function (){
+            $mdDialog.show(confirm)
+            .then(function (){
                 vm.collectionList.clear();
                 vm.collectionList.saveToStorage();
                 $scope.rootBroadcast(constants.YANGMAN_REFRESH_COLLECTIONS);
-                YangmanDesignService.enableMdMenuItem(event);
-            }, function () {
-                YangmanDesignService.enableMdMenuItem(event);
-            });
+            })
+            .then(YangmanDesignService.enableMdMenuItem(event));
         }
 
         /**
@@ -327,28 +325,11 @@ define([
 
             YangmanDesignService.disableMdMenuItem(event);
 
-            $mdDialog.show(confirm).then(function (){
-                if (reqObj){
-                    vm.mainList.deleteRequestItem(reqObj);
-                }
-                else {
-                    vm.mainList.getSelectedItems(
-                        vm.mainList === vm.collectionList ? filterCollReq : filterReq
-                    ).forEach(function (elem){
-                        vm.mainList.deleteRequestItem(elem);
-                    });
-                }
-                vm.mainList.saveToStorage();
-
-                if (vm.mainList === vm.requestList) {
-                    loadHistoryList();
-                }
-                else {
-                    refreshCollectionsWithExpansion();
-                }
-            }, function (){
-                YangmanDesignService.enableMdMenuItem(event);
-            });
+            $mdDialog.show(confirm)
+            .then(function (){
+                    deleteRequestsAndReload(reqObj);
+            })
+            .then(YangmanDesignService.enableMdMenuItem(event));
         }
 
 
@@ -368,13 +349,13 @@ define([
 
             YangmanDesignService.disableMdMenuItem(ev);
 
-            $mdDialog.show(confirm).then(function (){
+            $mdDialog.show(confirm)
+            .then(function (){
                 vm.collectionList.deleteCollection(collObj);
                 vm.collectionList.saveToStorage();
                 refreshCollectionsWithExpansion();
-            }, function (){
-                YangmanDesignService.enableMdMenuItem(ev);
-            });
+            })
+            .then(YangmanDesignService.enableMdMenuItem(ev));
         }
 
         /**
@@ -660,6 +641,26 @@ define([
             $scope.rootBroadcast(constants.YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS);
         }
 
+        function deleteRequestsAndReload(reqObj) {
+            if (reqObj){
+                vm.mainList.deleteRequestItem(reqObj);
+            }
+            else {
+                vm.mainList.getSelectedItems(
+                    vm.mainList === vm.collectionList ? filterCollReq : filterReq
+                ).forEach(function (elem){
+                    vm.mainList.deleteRequestItem(elem);
+                });
+            }
+            vm.mainList.saveToStorage();
+
+            if (vm.mainList === vm.requestList) {
+                loadHistoryList();
+            }
+            else {
+                refreshCollectionsWithExpansion();
+            }
+        }
     }
 
 });
-- 
2.36.6