Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement truncate-long-text for service class description and long description. #2224

Merged

Conversation

sg00dwin
Copy link
Member

@sg00dwin sg00dwin commented Oct 5, 2017

Updated views

Fixes #2072

Related on openshift/origin-web-common#214

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 5, 2017
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 10, 2017
@sg00dwin sg00dwin force-pushed the service-description-truncation branch from cb2f3f9 to 5e5cf63 Compare October 10, 2017 14:10
@sg00dwin
Copy link
Member Author

@spadgett rebased

</truncate-long-text></p>
<div ng-if="row.serviceClass.externalMetadata.documentationUrl || row.serviceClass.externalMetadata.supportUrl">
<a ng-if="row.serviceClass.externalMetadata.documentationUrl" ng-href="{{row.serviceClass.externalMetadata.documentationUrl}}" target="_blank" class="learn-more-link">View Documentation <i class="fa fa-external-link" aria-hidden="true"></i></a>
<a ng-if="row.serviceClass.externalMetadata.supportUrl" ng-href="{{row.serviceClass.externalMetadata.supportUrl}}" target="_blank" class="learn-more-link">Get Support <i class="fa fa-external-link" aria-hidden="true"></i></a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a bad merge on your rebase. These should have spec in the path as above.

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 10, 2017
@sg00dwin sg00dwin force-pushed the service-description-truncation branch from 5e5cf63 to c2b8d36 Compare October 10, 2017 18:19
@sg00dwin
Copy link
Member Author

@spadgett PTAL

</truncate-long-text></p>
<p class="service-description"><truncate-long-text
limit="500"
content="serviceClass.externalMetadata.longDescription"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's now

serviceClass.spec.externalMetadata.longDescription

<p class="pre-wrap" ng-bind-html="serviceClass.spec.externalMetadata.longDescription | linkify : '_blank'"></p>
<p class="service-description"><truncate-long-text
limit="500"
content="serviceClass.description"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's now

serviceClass.spec.description

@sg00dwin sg00dwin force-pushed the service-description-truncation branch from c2b8d36 to f21bb78 Compare October 10, 2017 18:56
@spadgett spadgett changed the title [WIP] Implement truncate-long-text for service class description and long description. Implement truncate-long-text for service class description and long description. Oct 11, 2017
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 11, 2017
@spadgett
Copy link
Member

[merge]

@openshift-bot
Copy link

Evaluated for origin web console merge up to f21bb78

@openshift-bot
Copy link

openshift-bot commented Oct 11, 2017

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin_web_console/334/) (Base Commit: 7fd5c10) (PR Branch Commit: f21bb78)

@openshift-bot openshift-bot merged commit 435773c into openshift:master Oct 11, 2017
@sg00dwin sg00dwin deleted the service-description-truncation branch October 11, 2017 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants