Skip to content

Fix awkward overview message for new deployments #1745

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 20, 2017
Merged

Fix awkward overview message for new deployments #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/overview/_list-row-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h3>
<div ng-if="row.apiObject.kind === 'DeploymentConfig'">
<span class="mar-right-sm">
<span class="hidden-xs">
{{row.apiObject.spec.strategy.type}} deployment
{{row.apiObject.spec.strategy.type}} deployment is
Copy link
Member

Choose a reason for hiding this comment

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

will that work for all statuses?

Copy link
Member Author

Choose a reason for hiding this comment

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

It should:

is new
is pending
is running
is complete
is failed

https://github.com/spadgett/origin/blob/5dce9b90d3eeab4a3c7a709c604c2a9ec2f7199f/pkg/deploy/api/types.go#L107-L120

{{row.current | deploymentStatus | lowercase}}&thinsp;<ellipsis-pulser color="dark" size="sm" display="inline" msg=""></ellipsis-pulser>
</span>
<!-- Don't show the strategy at phone resolutions to save space. -->
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11746,7 +11746,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"row.apiObject.kind === 'DeploymentConfig'\">\n" +
"<span class=\"mar-right-sm\">\n" +
"<span class=\"hidden-xs\">\n" +
"{{row.apiObject.spec.strategy.type}} deployment {{row.current | deploymentStatus | lowercase}}&thinsp;<ellipsis-pulser color=\"dark\" size=\"sm\" display=\"inline\" msg=\"\"></ellipsis-pulser>\n" +
"{{row.apiObject.spec.strategy.type}} deployment is {{row.current | deploymentStatus | lowercase}}&thinsp;<ellipsis-pulser color=\"dark\" size=\"sm\" display=\"inline\" msg=\"\"></ellipsis-pulser>\n" +
"</span>\n" +
"\n" +
"<span class=\"hidden visible-xs-inline nowrap\">\n" +
Expand Down