Skip to content

Commit

Permalink
Merge pull request #2334 from spadgett/max-pods-err-msg
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Bug 1505289 - Fix visible expression in HPA error message

Fix a visible AngularJS expression when max pods is smaller than min pods in the edit autoscaler form.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1505289
  • Loading branch information
openshift-merge-robot committed Oct 23, 2017
2 parents c74e141 + be415ef commit 1c7534f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/directives/osc-autoscaling.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<span class="help-block" ng-if="form.maxReplicas.$error.min">
Max pods must be greater than or equal to
<span ng-if="autoscaling.minReplicas">min pods, which is</span>
{{autoscaling.minReplicas || 1}.
{{autoscaling.minReplicas || 1}}.
</span>
<span class="help-block" ng-if="form.maxReplicas.$error.required">
Max pods is a required field.
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -8000,7 +8000,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<span class=\"help-block\" ng-if=\"form.maxReplicas.$error.min\">\n" +
"Max pods must be greater than or equal to\n" +
"<span ng-if=\"autoscaling.minReplicas\">min pods, which is</span>\n" +
"{{autoscaling.minReplicas || 1}.\n" +
"{{autoscaling.minReplicas || 1}}.\n" +
"</span>\n" +
"<span class=\"help-block\" ng-if=\"form.maxReplicas.$error.required\">\n" +
"Max pods is a required field.\n" +
Expand Down

0 comments on commit 1c7534f

Please sign in to comment.