Skip to content

Commit f892e0a

Browse files
author
OpenShift Bot
authored
Merge pull request #942 from spadgett/fix-no-source-inputs-pipeline-build
Merged by openshift-bot
2 parents b8f3206 + 314e5b4 commit f892e0a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/views/browse/build-config.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ <h2>No builds.</h2>
254254
</div>
255255
<dt ng-if-start="buildConfig.spec.source.binary.asFile">Binary Input as File:</dt>
256256
<dd ng-if-end>{{buildConfig.spec.source.binary.asFile}}</dd>
257-
<div ng-if="buildConfig.spec.source.type == 'None'">
257+
<div ng-if="buildConfig.spec.source.type == 'None' && !(buildConfig | isJenkinsPipelineStrategy)">
258258
<dt>Source:</dt>
259259
<dd>
260260
<i>none</i>

app/views/edit/build-config.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ <h3 class="with-divider">Jenkins Pipeline Configuration</h3>
278278
}" ng-model="updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile" class="ace-bordered ace-inline"></div>
279279
</div>
280280
</div>
281-
<div ng-if="sources.none">
281+
<div ng-if="sources.none && !(updatedBuildConfig | isJenkinsPipelineStrategy)">
282282
<div class="form-group">
283283
<i>No source inputs have been defined for this build configuration.</i>
284284
</div>

dist/scripts/templates.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
19141914
"</div>\n" +
19151915
"<dt ng-if-start=\"buildConfig.spec.source.binary.asFile\">Binary Input as File:</dt>\n" +
19161916
"<dd ng-if-end>{{buildConfig.spec.source.binary.asFile}}</dd>\n" +
1917-
"<div ng-if=\"buildConfig.spec.source.type == 'None'\">\n" +
1917+
"<div ng-if=\"buildConfig.spec.source.type == 'None' && !(buildConfig | isJenkinsPipelineStrategy)\">\n" +
19181918
"<dt>Source:</dt>\n" +
19191919
"<dd>\n" +
19201920
"<i>none</i>\n" +
@@ -8209,7 +8209,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
82098209
" }\" ng-model=\"updatedBuildConfig.spec.strategy.jenkinsPipelineStrategy.jenkinsfile\" class=\"ace-bordered ace-inline\"></div>\n" +
82108210
"</div>\n" +
82118211
"</div>\n" +
8212-
"<div ng-if=\"sources.none\">\n" +
8212+
"<div ng-if=\"sources.none && !(updatedBuildConfig | isJenkinsPipelineStrategy)\">\n" +
82138213
"<div class=\"form-group\">\n" +
82148214
"<i>No source inputs have been defined for this build configuration.</i>\n" +
82158215
"</div>\n" +

0 commit comments

Comments
 (0)