From 137f539a226c061069ec2f57aa30496b66aeeb6c Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Sat, 16 Nov 2019 08:24:16 -0500 Subject: [PATCH] fix(azure,gce): Fix typo breaking bake stage (#7631) (#7639) --- .../modules/azure/src/pipeline/stages/bake/azureBakeStage.js | 2 +- .../modules/google/src/pipeline/stages/bake/gceBakeStage.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/modules/azure/src/pipeline/stages/bake/azureBakeStage.js b/app/scripts/modules/azure/src/pipeline/stages/bake/azureBakeStage.js index 6994628d308..24c79520987 100644 --- a/app/scripts/modules/azure/src/pipeline/stages/bake/azureBakeStage.js +++ b/app/scripts/modules/azure/src/pipeline/stages/bake/azureBakeStage.js @@ -93,7 +93,7 @@ module.exports = angular $scope.stage.baseLabel = $scope.baseLabelOptions[0]; } $scope.viewState.roscoMode = - SETTINGS.feature.roscoModeSETTINGS.feature.roscoMode || + SETTINGS.feature.roscoMode || (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage)); $scope.viewState.loading = false; }); diff --git a/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js b/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js index f05f03c001e..106de1a25a5 100644 --- a/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js +++ b/app/scripts/modules/google/src/pipeline/stages/bake/gceBakeStage.js @@ -85,7 +85,7 @@ module.exports = angular $scope.stage.baseLabel = $scope.baseLabelOptions[0]; } $scope.viewState.roscoMode = - SETTINGS.feature.roscoModeSETTINGS.feature.roscoMode || + SETTINGS.feature.roscoMode || (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage)); $scope.showAdvancedOptions = showAdvanced(); $scope.viewState.loading = false;