Change-Id: Iafec55e1979d67ecb67114422ee1fe3dd0923a75
Signed-off-by: michal.kovacik <mikovaci@cisco.com>
.ok($filter('translate')('YANGMAN_OK'))
.cancel($filter('translate')('YANGMAN_CANCEL'));
.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();
vm.requestList.clear();
vm.requestList.saveToStorage();
loadHistoryList();
- YangmanDesignService.enableMdMenuItem(event);
- }, function (){
- YangmanDesignService.enableMdMenuItem(event);
- });
+ })
+ .then(YangmanDesignService.enableMdMenuItem(event));
YangmanDesignService.disableMdMenuItem(event);
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);
vm.collectionList.clear();
vm.collectionList.saveToStorage();
$scope.rootBroadcast(constants.YANGMAN_REFRESH_COLLECTIONS);
- YangmanDesignService.enableMdMenuItem(event);
- }, function () {
- YangmanDesignService.enableMdMenuItem(event);
- });
+ })
+ .then(YangmanDesignService.enableMdMenuItem(event));
YangmanDesignService.disableMdMenuItem(event);
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));
YangmanDesignService.disableMdMenuItem(ev);
YangmanDesignService.disableMdMenuItem(ev);
- $mdDialog.show(confirm).then(function (){
+ $mdDialog.show(confirm)
+ .then(function (){
vm.collectionList.deleteCollection(collObj);
vm.collectionList.saveToStorage();
refreshCollectionsWithExpansion();
vm.collectionList.deleteCollection(collObj);
vm.collectionList.saveToStorage();
refreshCollectionsWithExpansion();
- }, function (){
- YangmanDesignService.enableMdMenuItem(ev);
- });
+ })
+ .then(YangmanDesignService.enableMdMenuItem(ev));
$scope.rootBroadcast(constants.YANGMAN_REFRESH_AND_EXPAND_COLLECTIONS);
}
$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();
+ }
+ }