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 e173d56ce9 Fix more tables (#7139)
e173d56ce9 is described below
commit e173d56ce9c96930e719e4b25d5c69ffac87a479
Author: Steve Hamrick <[email protected]>
AuthorDate: Fri Oct 14 08:42:16 2022 -0600
Fix more tables (#7139)
---
.../table/cdnDeliveryServices/TableCDNDeliveryServicesController.js | 6 +++---
.../tenantDeliveryServices/TableTenantDeliveryServicesController.js | 6 +++---
.../app/src/modules/private/cdns/deliveryServices/index.js | 3 +++
.../app/src/modules/private/tenants/deliveryServices/index.js | 3 +++
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
index 5c650c9fa1..9972d3a7cf 100644
---
a/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/TableCDNDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-function TableCDNDeliveryServicesController(cdn, deliveryServices, filter,
$controller, $scope) {
+function TableCDNDeliveryServicesController(cdn, deliveryServices,
steeringTargets, filter, $controller, $scope) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'cdnDS', deliveryServices: deliveryServices, filter: filter, $scope:
$scope }));
+ angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'cdnDS', deliveryServices: deliveryServices, steeringTargets:
steeringTargets, filter: filter, $scope: $scope }));
$scope.cdn = cdn;
$scope.breadCrumbs = [
@@ -38,5 +38,5 @@ function TableCDNDeliveryServicesController(cdn,
deliveryServices, filter, $cont
];
};
-TableCDNDeliveryServicesController.$inject = ['cdn', 'deliveryServices',
'filter', '$controller', '$scope'];
+TableCDNDeliveryServicesController.$inject = ['cdn', 'deliveryServices',
'steeringTargets', 'filter', '$controller', '$scope'];
module.exports = TableCDNDeliveryServicesController;
diff --git
a/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/TableTenantDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/TableTenantDeliveryServicesController.js
index 8277426a81..ac02ce7604 100644
---
a/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/TableTenantDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/TableTenantDeliveryServicesController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-var TableTenantDeliveryServicesController = function(tenant, deliveryServices,
filter, $controller, $scope) {
+var TableTenantDeliveryServicesController = function(tenant, deliveryServices,
steeringTargets, filter, $controller, $scope) {
// extends the TableDeliveryServicesController to inherit common methods
- angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'tenantDS', deliveryServices: deliveryServices, filter: filter,
$scope: $scope }));
+ angular.extend(this, $controller('TableDeliveryServicesController', {
tableName: 'tenantDS', deliveryServices: deliveryServices, steeringTargets:
steeringTargets, filter: filter, $scope: $scope }));
$scope.tenant = tenant;
$scope.breadCrumbs = [
@@ -38,5 +38,5 @@ var TableTenantDeliveryServicesController = function(tenant,
deliveryServices, f
];
};
-TableTenantDeliveryServicesController.$inject = ['tenant', 'deliveryServices',
'filter', '$controller', '$scope'];
+TableTenantDeliveryServicesController.$inject = ['tenant', 'deliveryServices',
'steeringTargets', 'filter', '$controller', '$scope'];
module.exports = TableTenantDeliveryServicesController;
diff --git
a/traffic_portal/app/src/modules/private/cdns/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/cdns/deliveryServices/index.js
index 64b8fc3215..bfc84a74f1 100644
--- a/traffic_portal/app/src/modules/private/cdns/deliveryServices/index.js
+++ b/traffic_portal/app/src/modules/private/cdns/deliveryServices/index.js
@@ -33,6 +33,9 @@ module.exports =
angular.module('trafficPortal.private.cdns.deliveryServices', [
deliveryServices:
function($stateParams, deliveryServiceService) {
return
deliveryServiceService.getDeliveryServices({ cdn: $stateParams.cdnId });
},
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
filter: function(cdn) {
return {
cdnName: {
diff --git
a/traffic_portal/app/src/modules/private/tenants/deliveryServices/index.js
b/traffic_portal/app/src/modules/private/tenants/deliveryServices/index.js
index c9fb4f78d7..1ca97a9725 100644
--- a/traffic_portal/app/src/modules/private/tenants/deliveryServices/index.js
+++ b/traffic_portal/app/src/modules/private/tenants/deliveryServices/index.js
@@ -36,6 +36,9 @@ module.exports =
angular.module('trafficPortal.private.tenants.deliveryServices'
}
return
deliveryServiceService.getDeliveryServices({ tenant: tenant.id });
},
+ steeringTargets:
function (deliveryServiceService) {
+ return
deliveryServiceService.getSteering();
+ },
filter:
function($stateParams, tenant) {
if
($stateParams.all && $stateParams.all === 'true') {
return
null;
