This is an automated email from the ASF dual-hosted git repository. elsloo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit a0275724846275cba521cda7057f310d871ec38d Author: Jesse Rivas <jesse_ri...@comcast.com> AuthorDate: Thu Jan 25 15:08:50 2018 -0700 added TR Response Headers field for DS to TP --- .../form/deliveryService/FormDeliveryServiceController.js | 10 ++++++++++ .../deliveryService/form.deliveryService.Steering.tpl.html | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js index e554e76..40ad3ab 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js +++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js @@ -69,6 +69,16 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop return currentType.name.indexOf(category) != -1; }); + $scope.clientSteeringType = _.findWhere(types, {name: "CLIENT_STEERING"}); + $scope.isClientSteering = function(ds) { + if (ds.typeId == $scope.clientSteeringType.id) { + return true; + } else { + ds.trResponseHeaders = ""; + return false; + } + }; + $scope.falseTrue = [ { value: true, label: 'true' }, { value: false, label: 'false' } 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 3d097f6..9f8d358 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 @@ -215,6 +215,16 @@ under the License. </div> </div> + <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.trResponseHeaders), 'has-feedback': hasError(deliveryServiceForm.trResponseHeaders)}" + ng-if="isClientSteering(deliveryService)"> + <label class="control-label col-md-2 col-sm-2 col-xs-12">Traffic Router Additional Response Headers</label> + <div class="col-md-10 col-sm-10 col-xs-12"> + <input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024" autofocus> + <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trResponseHeaders, 'maxlength')">Too Long</small> + <span ng-show="hasError(deliveryServiceForm.trResponseHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span> + </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"> -- To stop receiving notification emails like this one, please contact els...@apache.org.