From a1942e65cd56fac421643cea0a07b23c4122ca48 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 4 Aug 2015 00:14:32 -0400
Subject: [PATCH] update interger directive instead of doing awnodash

---
 awx/ui/client/src/shared/directives.js | 8 ++++++--
 awx/ui/templates/ui/index.html         | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/shared/directives.js b/awx/ui/client/src/shared/directives.js
index dc5869e29f..18d8e707ed 100644
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -293,8 +293,12 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
                     if (/^\-?\d*$/.test(viewValue)) {
                        // it is valid
                         ctrl.$setValidity('integer', true);
-                        if ( elm.attr('min') &&
-                            ( viewValue === '' || viewValue === null || parseInt(viewValue,10) < parseInt(elm.attr('min'),10) ) ) {
+                        if ( viewValue === '-' || viewValue === '' || viewValue === null) {
+                            ctrl.$setValidity('integer', false);
+                            return viewValue;
+                        }
+                        if (elm.attr('min') &&
+                            parseInt(viewValue,10) < parseInt(elm.attr('min'),10) ) {
                             ctrl.$setValidity('min', false);
                             return viewValue;
                         }
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index decd437eaf..63d63ebd76 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -158,7 +158,7 @@
     <div id="prompt-for-days" style="display:none">
       <form name="prompt_for_days_form" id="prompt_for_days_form">
             Set how many days of data should be retained. <br>
-            <input type="integer" id="days_to_keep" name="days_to_keep" ng-model="days_to_keep" ng-required="true" class="form-control" min=0 aw-min=0 max=9999 aw-max=9999 aw-no-dash style="margin-top:10px;" integer>
+            <input type="integer" id="days_to_keep" name="days_to_keep" ng-model="days_to_keep" ng-required="true" class="form-control" min=0 max=9999 style="margin-top:10px;" integer>
             <div class="error" ng-show="prompt_for_days_form.days_to_keep.$dirty && (prompt_for_days_form.days_to_keep.$error.number || prompt_for_days_form.days_to_keep.$error.integer ||
             prompt_for_days_form.days_to_keep.$error.required ||
             prompt_for_days_form.days_to_keep.$error.min ||
@@ -181,7 +181,7 @@
                     </label>
                     <div class="row">
                         <div class="col-xs-4">
-                            <input type="integer" id="keep_amount" name="keep_amount" ng-model="keep_amount" ng-required="true" class="form-control" min=0 aw-min=0 max=9999 aw-max=9999 aw-no-dash style="margin-top:10px;" integer></input>
+                            <input type="integer" id="keep_amount" name="keep_amount" ng-model="keep_amount" ng-required="true" class="form-control" min=0 max=9999 style="margin-top:10px;" integer></input>
                         </div>
                         <div class="col-xs-4">
                             <select id="keep_unit" name="keep_unit" ng-model="keep_unit" ng-options="type.label for type in keep_unit_choices track by type.value" ng-required="true" class="form-control"  style="margin-top:10px;"></select>
@@ -201,7 +201,7 @@
                     </label>
                     <div class="row">
                         <div class="col-xs-4">
-                            <input type="integer" id="granularity_keep_amount" name="granularity_keep_amount" ng-model="granularity_keep_amount" ng-required="true" class="form-control" min=0 aw-min=0 max=9999 aw-max=9999 aw-no-dash style="margin-top:10px;" integer></input>
+                            <input type="integer" id="granularity_keep_amount" name="granularity_keep_amount" ng-model="granularity_keep_amount" ng-required="true" class="form-control" min=0 max=9999 style="margin-top:10px;" integer></input>
                         </div>
                         <div class="col-xs-4">
                             <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit"