From 4236e247c7a766e4fc987837d98708526ee60daf Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Mon, 3 Jul 2017 12:03:18 -0600
Subject: [PATCH] adds ccr dns ttl to all deliveryservices with appropriate
 default value

---
 .../deliveryService/form.deliveryService.DNS.tpl.html  |  9 +++++----
 .../deliveryService/form.deliveryService.HTTP.tpl.html | 10 ++++++++++
 .../form.deliveryService.Steering.tpl.html             | 10 ++++++++++
 .../form.deliveryService.anyMap.tpl.html               | 10 ++++++++++
 .../new/FormNewDeliveryServiceController.js            |  9 +++++++++
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 42600b8324..dddef6f661 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -232,12 +232,13 @@
                 </div>
             </div>
 
-            <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDNSTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDNSTtl)}">
+            <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDnsTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDnsTtl)}">
                 <label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service DNS TTL</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
-                    <input id="ccrDNSTtl" name="ccrDNSTtl" type="text" class="form-control" ng-model="deliveryService.ccrDNSTtl" ng-maxlength="11" autofocus>
-                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDNSTtl, 'maxlength')">Too Long</small>
-                    <span ng-show="hasError(deliveryServiceForm.ccrDNSTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+                    <input id="ccrDnsTtl" name="ccrDnsTtl" type="text" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-maxlength="11" ng-pattern="/^\d+$/" autofocus>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'maxlength')">Too Long</small>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Number</small>
+                    <span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
                 </div>
             </div>
 
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 8d26395b1d..f11079a870 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -180,6 +180,16 @@
                 </div>
             </div>
 
+            <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDnsTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDnsTtl)}">
+                <label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service DNS TTL</label>
+                <div class="col-md-10 col-sm-10 col-xs-12">
+                    <input id="ccrDnsTtl" name="ccrDnsTtl" type="text" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-maxlength="11" ng-pattern="/^\d+$/" autofocus>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'maxlength')">Too Long</small>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Number</small>
+                    <span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+                </div>
+            </div>
+
             <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.initialDispersion), 'has-feedback': hasError(deliveryServiceForm.initialDispersion)}">
                 <label class="control-label col-md-2 col-sm-2 col-xs-12">Initial Dispersion *</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 5f67348e70..432725e573 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -129,6 +129,16 @@
                 </div>
             </div>
 
+            <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDnsTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDnsTtl)}">
+                <label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service DNS TTL</label>
+                <div class="col-md-10 col-sm-10 col-xs-12">
+                    <input id="ccrDnsTtl" name="ccrDnsTtl" type="text" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-maxlength="11" ng-pattern="/^\d+$/" autofocus>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'maxlength')">Too Long</small>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Number</small>
+                    <span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+                </div>
+            </div>
+
             <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.longDesc), 'has-feedback': hasError(deliveryServiceForm.longDesc)}">
                 <label class="control-label col-md-2 col-sm-2 col-xs-12">Long Description</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
index ca04ef22d8..e4aa27e52a 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.anyMap.tpl.html
@@ -137,6 +137,16 @@
                 </div>
             </div>
 
+            <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDnsTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDnsTtl)}">
+                <label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service DNS TTL</label>
+                <div class="col-md-10 col-sm-10 col-xs-12">
+                    <input id="ccrDnsTtl" name="ccrDnsTtl" type="text" class="form-control" ng-model="deliveryService.ccrDnsTtl" ng-maxlength="11" ng-pattern="/^\d+$/" autofocus>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'maxlength')">Too Long</small>
+                    <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.ccrDnsTtl, 'pattern')">Number</small>
+                    <span ng-show="hasError(deliveryServiceForm.ccrDnsTtl)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+                </div>
+            </div>
+
             <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.remapText), 'has-feedback': hasError(deliveryServiceForm.remapText)}">
                 <label class="control-label col-md-2 col-sm-2 col-xs-12">Raw remap text</label>
                 <div class="col-md-10 col-sm-10 col-xs-12">
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index 01b764b6e1..d8f8e8dab8 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -23,6 +23,15 @@ var FormNewDeliveryServiceController = function(deliveryService, type, types, $s
 		return currentType.name.indexOf(type) != -1;
 	});
 
+	var setDNSTtl = function() {
+		if (type.indexOf('HTTP') != -1) {
+			deliveryService.ccrDnsTtl = 3600;
+		} else {
+			deliveryService.ccrDnsTtl = 30;
+		}
+	};
+	setDNSTtl();
+
 	// extends the FormDeliveryServiceController to inherit common methods
 	angular.extend(this, $controller('FormDeliveryServiceController', { deliveryService: deliveryService, types: filteredTypes, $scope: $scope }));