You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by zr...@apache.org on 2023/05/18 18:39:32 UTC
[trafficcontrol] branch master updated: TP Fix issues with DS Geo Limit (#7530)
This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 6306af9af5 TP Fix issues with DS Geo Limit (#7530)
6306af9af5 is described below
commit 6306af9af5edd37dc363dc14f64b8e829f4134ab
Author: Steve Hamrick <sh...@gmail.com>
AuthorDate: Thu May 18 12:39:25 2023 -0600
TP Fix issues with DS Geo Limit (#7530)
Fix issues with DS geo limit
---
.../modules/form/deliveryService/FormDeliveryServiceController.js | 6 +++---
.../deliveryService/clone/FormCloneDeliveryServiceController.js | 1 +
.../form/deliveryService/edit/FormEditDeliveryServiceController.js | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
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 452de62102..97ee2e7d6c 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -98,7 +98,7 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, origin,
$scope.toggleTLSRestrict = toggleTLSRestrict;
$scope.hasGeoLimitCountries = function(ds) {
- return ds && ds.geoLimit === 1 || ds.geoLimit === 2;
+ return ds !== undefined && (ds.geoLimit === 1 || ds.geoLimit === 2);
}
$scope.loadGeoLimitCountriesRaw = function (ds) {
@@ -505,8 +505,8 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, origin,
$scope.tlsVersionHasPropertyError = tlsVersionHasPropertyError;
this.$onInit = function() {
- $scope.loadGeoLimitCountriesRaw(this.deliveryService);
- $scope.loadGeoLimitCountriesRaw(this.dsCurrent);
+ $scope.loadGeoLimitCountriesRaw(deliveryService);
+ $scope.loadGeoLimitCountriesRaw(dsCurrent);
}
/**
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/clone/FormCloneDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/clone/FormCloneDeliveryServiceController.js
index ee3a9b7c62..f56856ff97 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/clone/FormCloneDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/clone/FormCloneDeliveryServiceController.js
@@ -37,6 +37,7 @@ var FormCloneDeliveryServiceController = function(deliveryService, origin, topol
// we're going to let them select an xmlId and a type for the clone
$scope.deliveryService.xmlId = null;
$scope.deliveryService.typeId = null;
+ $scope.loadGeoLimitCountriesRaw(deliveryService);
};
init();
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index 03f8da9bfb..07b34c8df1 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -46,6 +46,7 @@ var FormEditDeliveryServiceController = function(deliveryService, origin, topolo
this.$onInit = function() {
$scope.originalRoutingName = deliveryService.routingName;
$scope.originalCDN = deliveryService.cdnId;
+ $scope.loadGeoLimitCountriesRaw(deliveryService);
};
/**