Merge pull request #1706 from spadgett/hide-errors-scope-destroy

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/addConfigVolume.js

@@ -83,6 +83,7 @@ angular.module('openshiftConsole')
     var navigateBack = function() {
       $window.history.back();
     };
+    $scope.cancel = navigateBack;
 
     var displayError = function(errorMessage, errorDetails) {
       NotificationsService.addNotification({
@@ -96,6 +97,7 @@ angular.module('openshiftConsole')
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("add-config-volume-error");
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     $scope.addItem = function() {
       $scope.attach.items.push({});
@@ -107,11 +109,6 @@ angular.module('openshiftConsole')
       setDirty();
     };
 
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
-
     ProjectsService
       .get($routeParams.project)
       .then(_.spread(function(project, context) {

app/scripts/controllers/attachPVC.js

@@ -99,10 +99,12 @@ angular.module('openshiftConsole')
         var hideErrorNotifications = function() {
           NotificationsService.hideNotification("attach-pvc-error");
         };
+        $scope.$on('$destroy', hideErrorNotifications);
 
         var navigateBack = function() {
           $window.history.back();
         };
+        $scope.cancel = navigateBack;
 
         var isContainerSelected = function(container) {
           return $scope.attach.allContainers || $scope.attach.containers[container.name];
@@ -214,10 +216,5 @@ angular.module('openshiftConsole')
             );
           }
         };
-
-        $scope.cancel = function() {
-          hideErrorNotifications();
-          navigateBack();
-        };
     }));
   });

app/scripts/controllers/create/createFromImage.js

@@ -77,6 +77,7 @@ angular.module("openshiftConsole")
         }
       });
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     ProjectsService
       .get($routeParams.project)
@@ -410,7 +411,6 @@ angular.module("openshiftConsole")
       }));
 
       $scope.cancel = function() {
-        hideErrorNotifications();
         Navigate.toProjectOverview($scope.projectName);
       };
   });

app/scripts/controllers/createConfigMap.js

@@ -38,15 +38,12 @@ angular.module('openshiftConsole')
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("create-config-map-error");
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     var navigateBack = function() {
       $window.history.back();
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/createPersistentVolumeClaim.js

@@ -41,15 +41,12 @@ angular.module('openshiftConsole')
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("create-pvc-error");
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     var navigateBack = function() {
       $window.history.back();
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/createRoute.js

@@ -49,15 +49,12 @@ angular.module('openshiftConsole')
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("create-route-error");
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     var navigateBack = function() {
       $window.history.back();
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/edit/autoscaler.js

@@ -68,15 +68,12 @@ angular.module('openshiftConsole')
     var navigateBack = function() {
       $window.history.back();
     };
+    $scope.cancel = navigateBack;
 
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification('edit-hpa-error');
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/edit/buildConfig.js

@@ -238,18 +238,15 @@ angular.module('openshiftConsole')
         $window.history.back();
       }
     };
+    $scope.cancel = navigateBack;
 
     var hideErrorNotifications = function() {
       // TODO: Add method to NotificationsService for passing a list of IDs.
       NotificationsService.hideNotification("edit-build-config-error");
       NotificationsService.hideNotification("edit-build-config-conflict");
       NotificationsService.hideNotification("edit-build-config-deleted");
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/edit/configMap.js

@@ -41,11 +41,7 @@ angular.module('openshiftConsole')
     var navigateBack = function() {
       $window.history.back();
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
 
     ProjectsService
       .get($routeParams.project)
@@ -97,6 +93,7 @@ angular.module('openshiftConsole')
 
         $scope.$on('$destroy', function(){
           DataService.unwatchAll(watches);
+          hideErrorNotifications();
         });
     }));
   });

app/scripts/controllers/edit/deploymentConfig.js

@@ -392,11 +392,11 @@ angular.module('openshiftConsole')
     };
 
     $scope.cancel = function() {
-      hideErrorNotifications();
       $window.history.back();
     };
 
     $scope.$on('$destroy', function(){
       DataService.unwatchAll(watches);
+      hideErrorNotifications();
     });
   });

app/scripts/controllers/edit/healthChecks.js

@@ -66,15 +66,12 @@ angular.module('openshiftConsole')
     var navigateBack = function() {
       $location.url($scope.resourceURL);
     };
+    $scope.cancel = navigateBack;
 
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("add-health-check-error");
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/edit/route.js

@@ -43,15 +43,12 @@ angular.module('openshiftConsole')
     var hideErrorNotifications = function() {
       NotificationsService.hideNotification("edit-route-error");
     };
+    $scope.$on('$destroy', hideErrorNotifications);
 
     var navigateBack = function() {
       $location.path($scope.routeURL);
     };
-
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
 
     ProjectsService
       .get($routeParams.project)

app/scripts/controllers/setLimits.js

@@ -78,10 +78,8 @@ angular.module('openshiftConsole')
       NotificationsService.hideNotification("set-compute-limits-error");
     };
 
-    $scope.cancel = function() {
-      hideErrorNotifications();
-      navigateBack();
-    };
+    $scope.cancel = navigateBack;
+    $scope.$on('$destroy', hideErrorNotifications);
 
     ProjectsService
       .get($routeParams.project)