Merge pull request #1120 from benjaminapetersen/issue-1118-env-var-edit-err

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/controllers/replicaSet.js

@@ -436,6 +436,7 @@ angular.module('openshiftConsole')
             deploymentConfigName = annotation(replicaSet, 'deploymentConfig');
             rsName = replicaSet.metadata.name;
           }
+          $scope.deploymentConfigDeploymentsInProgress = $scope.deploymentConfigDeploymentsInProgress || {};
           if (!action) {
             // Loading of the page that will create deploymentConfigDeploymentsInProgress structure, which will associate running deployment to his deploymentConfig.
             $scope.deploymentConfigDeploymentsInProgress = DeploymentsService.associateRunningDeploymentToDeploymentConfig($scope.deploymentsByDeploymentConfig);
@@ -445,7 +446,9 @@ angular.module('openshiftConsole')
             $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName] = replicaSet;
           } else if (action === 'MODIFIED') {
             // After the deployment ends remove him from the deploymentConfigDeploymentsInProgress structure.
-            delete $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName];
+            if($scope.deploymentConfigDeploymentsInProgress[deploymentConfigName]) {
+              delete $scope.deploymentConfigDeploymentsInProgress[deploymentConfigName][rsName];
+            }
           }
 
           // Extract the causes from the encoded deployment config

dist/scripts/scripts.js

@@ -6375,7 +6375,7 @@ namespace:c.project
 }), w.push(g.watch(a.resource, l, function(c, d, e) {
 a.replicaSets = c.by("metadata.name"), a.emptyMessage = "No deployments to show", "ReplicationController" === r && (a.deploymentsByDeploymentConfig = h.associateDeploymentsToDeploymentConfig(a.replicaSets));
 var f, g;
-e && (f = t(e, "deploymentConfig"), g = e.metadata.name), d ? "ADDED" === d || "MODIFIED" === d && b("deploymentIsInProgress")(e) ? (a.deploymentConfigDeploymentsInProgress[f] = a.deploymentConfigDeploymentsInProgress[f] || {}, a.deploymentConfigDeploymentsInProgress[f][g] = e) :"MODIFIED" === d && delete a.deploymentConfigDeploymentsInProgress[f][g] :a.deploymentConfigDeploymentsInProgress = h.associateRunningDeploymentToDeploymentConfig(a.deploymentsByDeploymentConfig), e ? "DELETED" !== d && (e.causes = b("deploymentCauses")(e)) :angular.forEach(a.replicaSets, function(a) {
+e && (f = t(e, "deploymentConfig"), g = e.metadata.name), a.deploymentConfigDeploymentsInProgress = a.deploymentConfigDeploymentsInProgress || {}, d ? "ADDED" === d || "MODIFIED" === d && b("deploymentIsInProgress")(e) ? (a.deploymentConfigDeploymentsInProgress[f] = a.deploymentConfigDeploymentsInProgress[f] || {}, a.deploymentConfigDeploymentsInProgress[f][g] = e) :"MODIFIED" === d && a.deploymentConfigDeploymentsInProgress[f] && delete a.deploymentConfigDeploymentsInProgress[f][g] :a.deploymentConfigDeploymentsInProgress = h.associateRunningDeploymentToDeploymentConfig(a.deploymentsByDeploymentConfig), e ? "DELETED" !== d && (e.causes = b("deploymentCauses")(e)) :angular.forEach(a.replicaSets, function(a) {
 a.causes = b("deploymentCauses")(a);
 });
 })), w.push(g.watch("imagestreams", l, function(a) {