fix(core): allow expressions in pipeline stage application field (#5002)

spinnaker · Mar 15, 2018 · 164d32e · 164d32e
1 parent 965959c
commit 164d32e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.html
@@ -1,6 +1,7 @@
 <div class="form-horizontal">
   <stage-config-field label="Application">
-    <ui-select ng-model="stage.application" class="form-control input-sm">
+    <input ng-model="stage.application" class="form-control input-sm" ng-if="stage.application.includes('${')" />
+    <ui-select ng-model="stage.application" class="form-control input-sm" ng-if="!stage.application.includes('${')">
       <ui-select-match placeholder="None">{{$select.selected}}</ui-select-match>
 
       <ui-select-choices
@@ -12,7 +13,8 @@
     </ui-select>
   </stage-config-field>
   <stage-config-field label="Pipeline">
-    <div ng-if="stage.application && viewState.pipelinesLoaded">
+    <input ng-model="stage.pipeline" class="form-control input-sm" ng-if="stage.application.includes('${')" />
+    <div ng-if="stage.application && viewState.pipelinesLoaded && !stage.application.includes('${')">
       <ui-select class="form-control input-sm"
                  ng-model="stage.pipeline">
         <ui-select-match placeholder="Select a pipeline...">{{$select.selected.name}}</ui-select-match>

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js b/app/scripts/modules/core/src/pipeline/config/stages/pipeline/pipelineStage.js
@@ -56,7 +56,7 @@ module.exports = angular.module('spinnaker.core.pipeline.stage.pipelineStage', [
     });
 
     function initializeMasters() {
-      if ($scope.stage.application) {
+      if ($scope.stage.application && !$scope.stage.application.includes('${')) {
         pipelineConfigService.getPipelinesForApplication($scope.stage.application).then(function (pipelines) {
           $scope.pipelines = _.filter( pipelines, function(pipeline) { return pipeline.id !== $scope.pipeline.id; } );
           if (!_.find( pipelines, function(pipeline) { return pipeline.id === $scope.stage.pipeline; })) {