Merge pull request #749 from zherman0/bug9239

OpenShift Bot · web-flow · commit de8aca535f27 · 2016-10-27T13:47:15.000-04:00
Merged by openshift-bot
diff --git a/app/scripts/controllers/createPersistentVolumeClaim.js b/app/scripts/controllers/createPersistentVolumeClaim.js
@@ -78,7 +78,7 @@ angular.module('openshiftConsole')
           var unit =  $scope.claim.unit || "Mi";
           pvc.spec.resources.requests.storage = $scope.claim.amount + unit;
           pvc.spec.selector.matchLabels = keyValueEditorUtils.mapEntries( keyValueEditorUtils.compactEntries($scope.claim.selectedLabels) );
-          if ($scope.claim.storageClass !== null) {
+          if ($scope.claim.storageClass ) {
             //we can only have one storage class per claim
             pvc.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = $scope.claim.storageClass.metadata.name;
           }
diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -7954,7 +7954,7 @@ matchLabels:{}
 };
 a.spec.accessModes = [ c.claim.accessModes || "ReadWriteOnce" ];
 var b = c.claim.unit || "Mi";
-return a.spec.resources.requests.storage = c.claim.amount + b, a.spec.selector.matchLabels = i.mapEntries(i.compactEntries(c.claim.selectedLabels)), null !== c.claim.storageClass && (a.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
+return a.spec.resources.requests.storage = c.claim.amount + b, a.spec.selector.matchLabels = i.mapEntries(i.compactEntries(c.claim.selectedLabels)), c.claim.storageClass && (a.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;
 }
 c.project = b, c.breadcrumbs[0].title = a("displayName")(b), c.createPersistentVolumeClaim = function() {
 if (c.createPersistentVolumeClaimForm.$valid) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ angular.module('openshiftConsole')`
`78`	`78`	`var unit = $scope.claim.unit \|\| "Mi";`
`79`	`79`	`pvc.spec.resources.requests.storage = $scope.claim.amount + unit;`
`80`	`80`	`pvc.spec.selector.matchLabels = keyValueEditorUtils.mapEntries( keyValueEditorUtils.compactEntries($scope.claim.selectedLabels) );`
`81`		`- if ($scope.claim.storageClass !== null) {`
	`81`	`+ if ($scope.claim.storageClass ) {`
`82`	`82`	`//we can only have one storage class per claim`
`83`	`83`	`pvc.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = $scope.claim.storageClass.metadata.name;`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7954,7 +7954,7 @@ matchLabels:{}`
`7954`	`7954`	`};`
`7955`	`7955`	`a.spec.accessModes = [ c.claim.accessModes \|\| "ReadWriteOnce" ];`
`7956`	`7956`	`var b = c.claim.unit \|\| "Mi";`
`7957`		`-return a.spec.resources.requests.storage = c.claim.amount + b, a.spec.selector.matchLabels = i.mapEntries(i.compactEntries(c.claim.selectedLabels)), null !== c.claim.storageClass && (a.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;`
	`7957`	`+return a.spec.resources.requests.storage = c.claim.amount + b, a.spec.selector.matchLabels = i.mapEntries(i.compactEntries(c.claim.selectedLabels)), c.claim.storageClass && (a.metadata.annotations["volume.alpha.kubernetes.io/storage-class"] = c.claim.storageClass.metadata.name), a;`
`7958`	`7958`	`}`
`7959`	`7959`	`c.project = b, c.breadcrumbs[0].title = a("displayName")(b), c.createPersistentVolumeClaim = function() {`
`7960`	`7960`	`if (c.createPersistentVolumeClaimForm.$valid) {`