From 0eabd02cbee86741c60486e22f9489c9c166c2d8 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Thu, 14 Sep 2017 08:27:50 -0400
Subject: [PATCH] Bug 1491495 - Allow decimals in some number inputs

Change compute resources and storage amount inputs to accept decimals.
---
 app/views/_compute-resource.html                      | 2 +-
 app/views/directives/osc-persistent-volume-claim.html | 2 +-
 dist/scripts/templates.js                             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/_compute-resource.html b/app/views/_compute-resource.html
index 8fa43bd8cd..6fa84da626 100644
--- a/app/views/_compute-resource.html
+++ b/app/views/_compute-resource.html
@@ -9,7 +9,7 @@
                ng-attr-id="{{id}}"
                ng-model="input.amount"
                min="0"
-               pattern="\d*"
+               pattern="\d+(\.\d+)?"
                ng-attr-placeholder="{{placeholder}}"
                select-on-focus
                class="form-control"
diff --git a/app/views/directives/osc-persistent-volume-claim.html b/app/views/directives/osc-persistent-volume-claim.html
index 3dfec98d36..37e0f0ce3b 100644
--- a/app/views/directives/osc-persistent-volume-claim.html
+++ b/app/views/directives/osc-persistent-volume-claim.html
@@ -146,7 +146,7 @@
                    ng-model="claim.amount"
                    required
                    min="0"
-                   pattern="\d*"
+                   pattern="\d+(\.\d+)?"
                    select-on-focus
                    class="form-control"
                    aria-describedby="claim-capacity-help">
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 4cadcefb8c..e58e5fb737 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -75,7 +75,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"resource-size\" ng-class=\"{ 'has-error': form.$invalid }\">\n" +
     "<div class=\"resource-amount\">\n" +
     "<label class=\"sr-only\" ng-attr-for=\"{{id}}\">Amount</label>\n" +
-    "<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" +
+    "<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" +
     "</div>\n" +
     "<div class=\"resource-unit\">\n" +
     "<label class=\"sr-only\" ng-attr-for=\"{{id}}-unit\">Unit</label>\n" +
@@ -7895,7 +7895,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"resource-size\" ng-class=\"{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }\">\n" +
     "<div class=\"resource-amount\">\n" +
     "<label for=\"claim-amount\" class=\"sr-only\">Amount</label>\n" +
-    "<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" +
+    "<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" +
     "</div>\n" +
     "<div class=\"resource-unit\">\n" +
     "<label class=\"sr-only\">Unit</label>\n" +