Adding vendor (publisher) to service info screen #485
Merged
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
openshift-ci-robot
added
do-not-merge/work-in-progress
spadgett
approved these changes
Oct 10, 2017
jeff-phillips-18
approved these changes
Oct 10, 2017
rhamilto
commented
Oct 11, 2017
dist/less/order-service.less
Outdated
| @@ -1,6 +1,5 @@ | |||
| .order-service-details { | |||
| .order-service-details-top { | |||
| align-items: center; | |||
There was a problem hiding this comment.
We probably want to keep things centered until there are 3 or more lines.
openshift-ci-robot
added
size/M
rhamilto
changed the title
openshift-ci-robot
removed
the
do-not-merge/work-in-progress
|
@spadgett, I removed the addition of vendor to create from builder so this can merge now while we wait for the upstream builder annotation additions (vendor, docUrl, supportUrl). |
jeff-phillips-18
approved these changes
Oct 11, 2017
spadgett
requested changes
Oct 13, 2017
| @@ -62,6 +62,8 @@ export class OrderServiceController implements angular.IController { | |||
| this.ctrl.serviceName = this.ctrl.serviceClass.name; | |||
| this.ctrl.description = this.ctrl.serviceClass.description; | |||
| this.ctrl.longDescription = this.ctrl.serviceClass.longDescription; | |||
| this.ctrl.docUrl = this.ctrl.serviceClass.resource.spec.externalMetadata.documentationUrl; | |||
There was a problem hiding this comment.
I'm not sure externalMetadata is required. This might be a runtime error. Let's change it to
this.ctrl.docUrl = _.get(this.ctrl.serviceClass, 'resource.spec.externalMetadata.documentationUrl');
this.ctrl.supportUrl = _.get(this.ctrl.serviceClass, 'resource.spec.externalMetadata. supportUrl');
|
Comment addressed. Thanks, @spadgett! |
spadgett
approved these changes
Oct 13, 2017
openshift-merge-robot
added a commit
to openshift/origin-web-console
that referenced
this pull request
Oct 13, 2017
Automatic merge from submit-queue. Adding vendor (publisher) to info screens, adds docUrl and supportUrl to info screens that lacked it Fixes openshift/origin-web-catalog#479 And fixes #2242 Requires openshift/origin-web-catalog#485 <img width="915" alt="screen shot 2017-10-10 at 2 32 50 pm" src="https://user-images.githubusercontent.com/895728/31404030-dde2fe2c-adc8-11e7-9a73-68bd4e1ed138.PNG"> <img width="925" alt="screen shot 2017-10-10 at 2 32 56 pm" src="https://user-images.githubusercontent.com/895728/31404031-ddf83dd2-adc8-11e7-8ec8-13aca55d70f3.PNG"> <img width="909" alt="screen shot 2017-10-10 at 2 33 06 pm" src="https://user-images.githubusercontent.com/895728/31404032-de091102-adc8-11e7-9253-9211cc3064f1.PNG"> <img width="926" alt="screen shot 2017-10-10 at 2 33 12 pm" src="https://user-images.githubusercontent.com/895728/31404035-de237bf0-adc8-11e7-9eb8-060ffc45435f.PNG">
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.
Supports #479
Adjusts styles:
vs.