BuildConfig editor fix #7109
Merged
BuildConfig editor fix #7109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -351,7 +354,7 @@ angular.module('openshiftConsole') | |||
| $scope.imageSourceBuildFrom.tags = {}; | |||
| var projectImageStreams = imageStreams.by("metadata.name"); | |||
| if (!_.isEmpty(projectImageStreams)) { | |||
| if (!Object.keys(projectImageStreams).contains($scope.imageSourceBuildFrom.imageStream) && projectName === $scope.imageSourceBuildFrom.namespace) { | |||
| if (!Object.keys(projectImageStreams).contains($scope.imageSourceBuildFrom.imageStream) && projectName === $scope.imageSourceBuildFrom.namespace && !selectFirstOption) { | |||
There was a problem hiding this comment.
These should really use Object.hasOwnProperty or _.has.
!_.has(projectImageStreams, $scope.imageSourceBuildFrom.imageStream)
Not new in this PR, but worth fixing since we're changing the code.
|
LGTM except for the one comment |
|
@spadgett sorry for the confusion on the irc, there are only 3 substitutions not 13. |
|
LGTM [merge] |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/918/) (Image: devenv-rhel7_3363) |
|
Evaluated for origin merge up to cb63a00 |
|
[Test]ing while waiting on the merge queue |
|
Evaluated for origin test up to cb63a00 |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/918/) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When changing the builder/output/imageSource Type from imageStreamImage || dockerImage to imageStreamTag the imageStream value has been added to the list of the imageStream options, which should be done only when the data are loaded, that means when the buildConfig has specified different imageStream than exists, to prevent loss of data.
Also renaming
imageSourcesOptionstoimageSourceOptionswhich wasnt causing any issues, but forgot to rename when was doing final updates.@spadgett I've tested the change and should be working now as desired. PTAL.