Skip to content

Commit d1335a5

Browse files
spadgettf0x11
authored andcommitted
Bug 1491495 - Allow decimals in some number inputs
Change compute resources and storage amount inputs to accept decimals.
1 parent 2cc3bb9 commit d1335a5

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

app/views/_compute-resource.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
ng-attr-id="{{id}}"
1010
ng-model="input.amount"
1111
min="0"
12-
pattern="\d*"
12+
pattern="\d+(\.\d+)?"
1313
ng-attr-placeholder="{{placeholder}}"
1414
select-on-focus
1515
class="form-control"

app/views/directives/osc-persistent-volume-claim.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
ng-model="claim.amount"
143143
required
144144
min="0"
145-
pattern="\d*"
145+
pattern="\d+(\.\d+)?"
146146
select-on-focus
147147
class="form-control"
148148
aria-describedby="claim-capacity-help">

dist/scripts/templates.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
7878
"<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" ng-attr-placeholder=\"{{placeholder}}\" class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
7979
=======
8080
"<label class=\"sr-only\" ng-attr-for=\"{{id}}\">Amount</label>\n" +
81+
<<<<<<< 8a34936c48f608fee0ba519704760e330f592798
8182
"<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" pattern=\"\\d*\" ng-attr-placeholder=\"{{placeholder}}\" select-on-focus class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
8283
>>>>>>> Bug 1470976 - Support number input on iOS
84+
=======
85+
"<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" pattern=\"\\d+(\\.\\d+)?\" ng-attr-placeholder=\"{{placeholder}}\" select-on-focus class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
86+
>>>>>>> Bug 1491495 - Allow decimals in some number inputs
8387
"</div>\n" +
8488
"<div class=\"resource-unit\">\n" +
8589
"<label class=\"sr-only\" ng-attr-for=\"{{id}}-unit\" translate>Unit</label>\n" +
@@ -8511,7 +8515,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
85118515
"<div class=\"resource-size\" ng-class=\"{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }\">\n" +
85128516
"<div class=\"resource-amount\">\n" +
85138517
"<label for=\"claim-amount\" class=\"sr-only\">Amount</label>\n" +
8514-
"<input type=\"number\" name=\"capacity\" id=\"claim-amount\" ng-model=\"claim.amount\" required min=\"0\" pattern=\"\\d*\" select-on-focus class=\"form-control\" aria-describedby=\"claim-capacity-help\">\n" +
8518+
"<input type=\"number\" name=\"capacity\" id=\"claim-amount\" ng-model=\"claim.amount\" required min=\"0\" pattern=\"\\d+(\\.\\d+)?\" select-on-focus class=\"form-control\" aria-describedby=\"claim-capacity-help\">\n" +
85158519
"</div>\n" +
85168520
"<div class=\"resource-unit\">\n" +
85178521
"<label class=\"sr-only\">Unit</label>\n" +

0 commit comments

Comments
 (0)