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 2439b1083c..7bca188956 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js +++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js @@ -315,7 +315,7 @@ var FormDeliveryServiceController = function(deliveryService, dsCurrent, origin, ]; $scope.clone = function(ds) { - locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?type=' + ds.type); + locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?dsType=' + ds.type); }; $scope.changeSigningAlgorithm = function(signingAlgorithm) { 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 8199aa2169..4eb59b2e66 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 @@ -113,7 +113,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog function(result) { createDeliveryServiceCreateRequest(dsRequest, options.comment, true); messageModel.setMessages(result.data.alerts, true); - locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type); + locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type); }, function(fault) { $anchorScroll(); // scrolls window to top @@ -133,7 +133,7 @@ var FormNewDeliveryServiceController = function(deliveryService, origin, topolog then( function(result) { messageModel.setMessages(result.data.alerts, true); - locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type); + locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type); }, function(fault) { $anchorScroll(); // scrolls window to top diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html index 4b20831229..3a2f3e5b3c 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceConsistentHashRegex/form.deliveryServiceConsistentHashRegex.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Consistent Hash Regex Test Tool
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html index 8cd6f26da4..914c123b89 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceJob/form.deliveryServiceJob.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Invalidation Requests
  5. {{jobName}}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceRegex/form.deliveryServiceRegex.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceRegex/form.deliveryServiceRegex.tpl.html index 693ddcbcac..8613572fce 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceRegex/form.deliveryServiceRegex.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceRegex/form.deliveryServiceRegex.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Regexes
  5. {{regexPattern}}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html index 489491851e..f1185c0346 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. SSL keys
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html index 8af7655349..823524f14d 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/generate/form.GenerateDeliveryServiceSslKeys.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. SSL Keys
  5. generate
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceStaticDnsEntry/form.deliveryServiceStaticDnsEntry.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceStaticDnsEntry/form.deliveryServiceStaticDnsEntry.tpl.html index 19c40255da..ab6c592915 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceStaticDnsEntry/form.deliveryServiceStaticDnsEntry.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceStaticDnsEntry/form.deliveryServiceStaticDnsEntry.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Static DNS Entries
  5. {{host}}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/form.deliveryServiceTarget.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/form.deliveryServiceTarget.tpl.html index 0ac9a43d03..99b16dc4ee 100644 --- a/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/form.deliveryServiceTarget.tpl.html +++ b/traffic_portal/app/src/common/modules/form/deliveryServiceTarget/form.deliveryServiceTarget.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Targets
  5. {{targetName}}
diff --git a/traffic_portal/app/src/common/modules/form/origin/FormOriginController.js b/traffic_portal/app/src/common/modules/form/origin/FormOriginController.js index 9f88347b93..c525cbb3ca 100644 --- a/traffic_portal/app/src/common/modules/form/origin/FormOriginController.js +++ b/traffic_portal/app/src/common/modules/form/origin/FormOriginController.js @@ -78,7 +78,7 @@ var FormOriginController = function(origin, $scope, $window, $location, formUtil $scope.editDeliveryService = function(deliveryServiceId) { ds = _.findWhere($scope.deliveryServices, { id: deliveryServiceId }); - $window.open('/#!/delivery-services/' + ds.id + '?type=' + ds.type, '_blank'); + $window.open('/#!/delivery-services/' + ds.id + '?dsType=' + ds.type, '_blank'); }; $scope.hasError = formUtils.hasError; diff --git a/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html index 5490bd1c82..00dd7961f1 100644 --- a/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html @@ -68,11 +68,11 @@ diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html index 59ccb1c7b2..81f3579095 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Required Server Capabilities
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js index a166aa5f6d..7a87c036eb 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceJobs/TableDeliveryServiceJobsController.js @@ -35,7 +35,7 @@ var TableDeliveryServiceJobsController = function(deliveryService, jobs, $contro return $scope.deliveryService.xmlId; }, getHref: function () { - return "#!/delivery-services/" + $scope.deliveryService.id + "?type=" + encodeURIComponent($scope.deliveryService.type); + return "#!/delivery-services/" + $scope.deliveryService.id + "?dsType=" + encodeURIComponent($scope.deliveryService.type); } }, { diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceOrigins/table.deliveryServiceOrigins.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceOrigins/table.deliveryServiceOrigins.tpl.html index fa33ce5818..3cac061588 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceOrigins/table.deliveryServiceOrigins.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceOrigins/table.deliveryServiceOrigins.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Origins
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html index 6fe8eed948..355c2afacc 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRegexes/table.deliveryServiceRegexes.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Regexes
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js index ed775de824..a5f6cfaa90 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequestComments/TableDeliveryServiceRequestCommentsController.js @@ -20,7 +20,7 @@ var TableDeliveryServicesRequestsController = function (request, $scope, $state, $stateParams, $uibModal, $anchorScroll, dateUtils, locationUtils, deliveryServiceRequestService, messageModel) { $scope.request = request[0]; - $scope.type = $stateParams.type; + $scope.type = $stateParams.dsType; $scope.defaultParams = { placeholder: '', text: null, diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js index 869dfb5612..6b228f2ed5 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceRequests/TableDeliveryServiceRequestsController.js @@ -144,7 +144,7 @@ var TableDeliveryServicesRequestsController = function (tableName, dsRequests, $ if(selection === "" || selection === $scope.mouseDownSelectionText) { const typeId = (params.data.requested) ? params.data.requested.typeId : params.data.original.typeId; - let path = '/delivery-service-requests/' + params.data.id + '?type='; + let path = '/delivery-service-requests/' + params.data.id + '?dsType='; typeService.getType(typeId) .then(function (result) { path += result.name; @@ -542,7 +542,7 @@ var TableDeliveryServicesRequestsController = function (tableName, dsRequests, $ const typeId = (request.requested) ? request.requested.typeId : request.original.typeId; - let path = '/delivery-service-requests/' + request.id + '?type='; + let path = '/delivery-service-requests/' + request.id + '?dsType='; typeService.getType(typeId) .then(function (result) { path += result.name; diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js index 0522fa7821..7cf6ddba62 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js @@ -157,7 +157,7 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, f }, { getHref: function() { - return "#!/delivery-services/" + $scope.deliveryService.id + "?type=" + encodeURIComponent($scope.deliveryService.type); + return "#!/delivery-services/" + $scope.deliveryService.id + "?dsType=" + encodeURIComponent($scope.deliveryService.type); }, getText: function() { return $scope.deliveryService.xmlId; diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html index f3cebbf6d3..f502936a96 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceStaticDnsEntries/table.deliveryServiceStaticDnsEntries.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Static DNS Entries
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceTargets/table.deliveryServiceTargets.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceTargets/table.deliveryServiceTargets.tpl.html index 5d43fb13b5..7b4f8c0b93 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceTargets/table.deliveryServiceTargets.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceTargets/table.deliveryServiceTargets.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Targets
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceUsers/table.deliveryServiceUsers.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceUsers/table.deliveryServiceUsers.tpl.html index 6017f1ac12..7819283a96 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceUsers/table.deliveryServiceUsers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceUsers/table.deliveryServiceUsers.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. Users
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js index 7af7019f82..35c9b9e58e 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js +++ b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js @@ -394,7 +394,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt let showCustomCharts = propertiesModel.properties.deliveryServices.charts.customLink.show; var createDeliveryService = function(typeName) { - var path = '/delivery-services/new?type=' + typeName; + var path = '/delivery-services/new?dsType=' + typeName; locationUtils.navigateToPath(path); }; @@ -425,7 +425,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt } }); modalInstance.result.then(function(type) { - locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?type=' + type.name); + locationUtils.navigateToPath('/delivery-services/' + ds.id + '/clone?dsType=' + type.name); }); }; @@ -592,7 +592,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt if (showCustomCharts) { deliveryServiceUtils.openCharts(ds); } else { - locationUtils.navigateToPath('/delivery-services/' + ds.id + '/charts?type=' + ds.type); + locationUtils.navigateToPath('/delivery-services/' + ds.id + '/charts?dsType=' + ds.type); } }; @@ -725,7 +725,7 @@ var TableDeliveryServicesController = function(tableName, deliveryServices, filt onRowClicked: function(params) { const selection = window.getSelection().toString(); if(selection === "" || selection === $scope.mouseDownSelectionText) { - locationUtils.navigateToPath('/delivery-services/' + params.data.id + '?type=' + params.data.type); + locationUtils.navigateToPath('/delivery-services/' + params.data.id + '?dsType=' + params.data.type); // Event is outside the digest cycle, so we need to trigger one. $scope.$apply(); } diff --git a/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html index 81aab44068..8c5f25a087 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServices/table.deliveryServices.tpl.html @@ -69,11 +69,11 @@ diff --git a/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/TableServerCapabilityDeliveryServicesController.js b/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/TableServerCapabilityDeliveryServicesController.js index 93dd27feec..341663d214 100644 --- a/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/TableServerCapabilityDeliveryServicesController.js +++ b/traffic_portal/app/src/common/modules/table/serverCapabilityDeliveryServices/TableServerCapabilityDeliveryServicesController.js @@ -84,7 +84,7 @@ var TableServerCapabilityDeliveryServicesController = function(serverCapability, $scope.editDeliveryService = function(ds) { deliveryServiceService.getDeliveryService(ds.deliveryServiceID) .then(function(result) { - let path = '/delivery-services/' + result.id + '?type=' + result.type; + let path = '/delivery-services/' + result.id + '?dsType=' + result.type; locationUtils.navigateToPath(path); }); }; diff --git a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html index 4164b6bbcd..c182756fff 100644 --- a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html @@ -71,7 +71,7 @@ diff --git a/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/table.serviceCategoryDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/table.serviceCategoryDeliveryServices.tpl.html index 5623bd2f25..f569543c4d 100644 --- a/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/table.serviceCategoryDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/serviceCategoryDeliveryServices/table.serviceCategoryDeliveryServices.tpl.html @@ -68,11 +68,11 @@ diff --git a/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/table.tenantDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/table.tenantDeliveryServices.tpl.html index a8ed90635c..5ed26baba7 100644 --- a/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/table.tenantDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/tenantDeliveryServices/table.tenantDeliveryServices.tpl.html @@ -68,11 +68,11 @@ diff --git a/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/table.topologyDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/table.topologyDeliveryServices.tpl.html index 0a67d8fda2..ed10084321 100644 --- a/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/table.topologyDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/topologyDeliveryServices/table.topologyDeliveryServices.tpl.html @@ -68,11 +68,11 @@ diff --git a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html index 527f82355d..2ae3920318 100644 --- a/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html +++ b/traffic_portal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html @@ -68,11 +68,11 @@ diff --git a/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js b/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js index e7edc4f44a..3b55ac91ef 100644 --- a/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js +++ b/traffic_portal/app/src/common/modules/widget/deliveryServices/WidgetDeliveryServicesController.js @@ -228,7 +228,7 @@ var WidgetDeliveryServicesController = function ($scope, $timeout, $filter, $q, }; $scope.navigateToCharts = function () { - locationUtils.navigateToPath('/delivery-services/' + $scope.selectedDeliveryService.id + '/charts?type=' + $scope.selectedDeliveryService.type); + locationUtils.navigateToPath('/delivery-services/' + $scope.selectedDeliveryService.id + '/charts?dsType=' + $scope.selectedDeliveryService.type); }; // pagination diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js index bd40d46245..163198e5dd 100644 --- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/comments/index.js @@ -21,7 +21,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests.c .config(function ($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServiceRequests.comments', { - url: '/{deliveryServiceRequestId:[0-9]{1,8}}/comments?type', + url: '/{deliveryServiceRequestId:[0-9]{1,8}}/comments?dsType', views: { deliveryServiceRequestsContent: { templateUrl: 'common/modules/table/deliveryServiceRequestComments/table.deliveryServiceRequestComments.tpl.html', diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js index a29dc3c145..86aea1e07b 100644 --- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js +++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/FormEditDeliveryServiceRequestController.js @@ -127,7 +127,7 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, function(result) { updateDeliveryServiceRequest('pending'); // after a successful create, update the ds request, assignee and status messageModel.setMessages([ { level: 'success', text: 'Delivery Service [ ' + ds.xmlId + ' ] created' } ], true); - locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type); + locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type); }, function(fault) { $anchorScroll(); // scrolls window to top @@ -145,7 +145,7 @@ var FormEditDeliveryServiceRequestController = function(deliveryServiceRequest, level: 'success', text: 'Delivery Service [ ' + ds.xmlId + ' ] updated' }], true); - locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?type=' + result.data.response[0].type); + locationUtils.navigateToPath('/delivery-services/' + result.data.response[0].id + '?dsType=' + result.data.response[0].type); }, function (fault) { $anchorScroll(); // scrolls window to top diff --git a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js index ff611cff9b..ba3bf90064 100644 --- a/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServiceRequests/edit/index.js @@ -22,11 +22,11 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests.e .config(function ($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServiceRequests.edit', { - url: '/{deliveryServiceRequestId:[0-9]{1,8}}?type&fulfill', + url: '/{deliveryServiceRequestId:[0-9]{1,8}}?dsType&fulfill', views: { deliveryServiceRequestsContent: { templateUrl: function ($stateParams) { - var type = $stateParams.type, + var type = $stateParams.dsType, template; if (type.indexOf('ANY_MAP') != -1) { @@ -68,7 +68,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServiceRequests.e return topologyService.getTopologies(); }, type: function ($stateParams) { - return $stateParams.type; + return $stateParams.dsType; }, types: function (typeService) { return typeService.getTypes({useInTable: 'deliveryservice'}); diff --git a/traffic_portal/app/src/modules/private/deliveryServices/capabilities/index.js b/traffic_portal/app/src/modules/private/deliveryServices/capabilities/index.js index 3dfc08554d..f24eb19970 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/capabilities/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/capabilities/index.js @@ -21,7 +21,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.capabili .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.capabilities', { - url: '/{deliveryServiceId}/required-server-capabilities?type', + url: '/{deliveryServiceId}/required-server-capabilities?dsType', views: { deliveryServicesContent: { templateUrl: 'common/modules/table/deliveryServiceCapabilities/table.deliveryServiceCapabilities.tpl.html', diff --git a/traffic_portal/app/src/modules/private/deliveryServices/charts/charts.tpl.html b/traffic_portal/app/src/modules/private/deliveryServices/charts/charts.tpl.html index c362630ec2..ab7b932dcd 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/charts/charts.tpl.html +++ b/traffic_portal/app/src/modules/private/deliveryServices/charts/charts.tpl.html @@ -21,7 +21,7 @@
  1. Delivery Services
    2. -
  2. {{deliveryService.xmlId}}
    3. +
  3. {{deliveryService.xmlId}}
  4. Charts
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js b/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js index fa188e817b..b16ed99e95 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js @@ -21,11 +21,11 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.clone', .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.clone', { - url: '/{deliveryServiceId:[0-9]{1,8}}/clone?type', + url: '/{deliveryServiceId:[0-9]{1,8}}/clone?dsType', views: { deliveryServicesContent: { templateUrl: function ($stateParams) { - var type = $stateParams.type, + var type = $stateParams.dsType, template; if (type.indexOf('ANY_MAP') != -1) { @@ -54,7 +54,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.clone', return topologyService.getTopologies(); }, type: function($stateParams) { - return $stateParams.type; + return $stateParams.dsType; }, types: function(typeService) { return typeService.getTypes({ useInTable: 'deliveryservice' }); diff --git a/traffic_portal/app/src/modules/private/deliveryServices/edit/index.js b/traffic_portal/app/src/modules/private/deliveryServices/edit/index.js index 896e4ad578..d187907a9d 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/edit/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/edit/index.js @@ -21,11 +21,11 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.edit', [ .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.edit', { - url: '/{deliveryServiceId:[0-9]{1,8}}?type', + url: '/{deliveryServiceId:[0-9]{1,8}}?dsType', views: { deliveryServicesContent: { templateUrl: function ($stateParams) { - var type = $stateParams.type, + var type = $stateParams.dsType, template; if (type.indexOf('ANY_MAP') != -1) { @@ -54,7 +54,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.edit', [ return topologyService.getTopologies(); }, type: function($stateParams) { - return $stateParams.type; + return $stateParams.dsType; }, types: function(typeService) { return typeService.getTypes({ useInTable: 'deliveryservice' }); diff --git a/traffic_portal/app/src/modules/private/deliveryServices/jobs/index.js b/traffic_portal/app/src/modules/private/deliveryServices/jobs/index.js index e6c8996c30..7c207045e6 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/jobs/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/jobs/index.js @@ -22,7 +22,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.jobs', [ .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.jobs', { - url: '/{deliveryServiceId}/jobs?type', + url: '/{deliveryServiceId}/jobs?dsType', abstract: true, views: { deliveryServicesContent: { diff --git a/traffic_portal/app/src/modules/private/deliveryServices/new/index.js b/traffic_portal/app/src/modules/private/deliveryServices/new/index.js index 3b04e799f4..3a42c06a11 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/new/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/new/index.js @@ -21,11 +21,11 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.new', [] .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.new', { - url: '/new?type', + url: '/new?dsType', views: { deliveryServicesContent: { templateUrl: function ($stateParams) { - var type = $stateParams.type, + var type = $stateParams.dsType, template; if (type.indexOf('ANY_MAP') != -1) { @@ -43,7 +43,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.new', [] controller: 'FormNewDeliveryServiceController', resolve: { deliveryService: function($stateParams, propertiesModel) { - var type = $stateParams.type, + var type = $stateParams.dsType, anyMapDefaults = angular.copy(propertiesModel.properties.deliveryServices.defaults.ANY_MAP), dnsDefaults = angular.copy(propertiesModel.properties.deliveryServices.defaults.DNS), httpDefaults = angular.copy(propertiesModel.properties.deliveryServices.defaults.HTTP), @@ -68,7 +68,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.new', [] return topologyService.getTopologies(); }, type: function($stateParams) { - return $stateParams.type; + return $stateParams.dsType; }, types: function(typeService) { return typeService.getTypes({ useInTable: 'deliveryservice' }); diff --git a/traffic_portal/app/src/modules/private/deliveryServices/servers/index.js b/traffic_portal/app/src/modules/private/deliveryServices/servers/index.js index db8bd6f148..c6d0477d2d 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/servers/index.js +++ b/traffic_portal/app/src/modules/private/deliveryServices/servers/index.js @@ -21,7 +21,7 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.servers' .config(function($stateProvider, $urlRouterProvider) { $stateProvider .state('trafficPortal.private.deliveryServices.servers', { - url: '/{deliveryServiceId}/servers?type', + url: '/{deliveryServiceId}/servers?dsType', views: { deliveryServicesContent: { templateUrl: 'common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html', diff --git a/traffic_portal/app/src/modules/private/deliveryServices/uriSigningKeys/deliveryServiceUriSigningKeys.tpl.html b/traffic_portal/app/src/modules/private/deliveryServices/uriSigningKeys/deliveryServiceUriSigningKeys.tpl.html index f881846706..3982e70d3a 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/uriSigningKeys/deliveryServiceUriSigningKeys.tpl.html +++ b/traffic_portal/app/src/modules/private/deliveryServices/uriSigningKeys/deliveryServiceUriSigningKeys.tpl.html @@ -22,7 +22,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. URI Signing Keys
diff --git a/traffic_portal/app/src/modules/private/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html b/traffic_portal/app/src/modules/private/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html index 74be76f9cf..9bc67689fb 100644 --- a/traffic_portal/app/src/modules/private/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html +++ b/traffic_portal/app/src/modules/private/deliveryServices/urlSigKeys/deliveryServiceUrlSigKeys.tpl.html @@ -23,7 +23,7 @@
  1. Delivery Services
    2. -
  2. {{::deliveryService.xmlId}}
    3. +
  3. {{::deliveryService.xmlId}}
  4. URL Sig Keys