[GitHub] mitchell852 closed pull request #2554: Fix TP clone DS by adding proper DS origin resolution

[GitBox <gi...@apache.org>]

mitchell852 closed pull request #2554: Fix TP clone DS by adding proper DS origin resolution
URL: https://github.com/apache/trafficcontrol/pull/2554
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 44882cf8b..b1b30cf07 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
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-var FormCloneDeliveryServiceController = function(deliveryService, type, types, $scope, $controller) {
+var FormCloneDeliveryServiceController = function(deliveryService, origin, type, types, $scope, $controller) {
 
 	// extends the FormNewDeliveryServiceController to inherit common methods
-	angular.extend(this, $controller('FormNewDeliveryServiceController', { deliveryService: deliveryService, type: type, types: types, $scope: $scope }));
+	angular.extend(this, $controller('FormNewDeliveryServiceController', { deliveryService: deliveryService, origin: origin, type: type, types: types, $scope: $scope }));
 
 	$scope.deliveryServiceName = deliveryService.xmlId + ' clone';
 
@@ -40,5 +40,5 @@ var FormCloneDeliveryServiceController = function(deliveryService, type, types,
 
 };
 
-FormCloneDeliveryServiceController.$inject = ['deliveryService', 'type', 'types', '$scope', '$controller'];
+FormCloneDeliveryServiceController.$inject = ['deliveryService', 'origin', 'type', 'types', '$scope', '$controller'];
 module.exports = FormCloneDeliveryServiceController;
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 7e2a9145e..c24dd0f0a 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js
@@ -47,6 +47,9 @@ module.exports = angular.module('trafficPortal.private.deliveryServices.clone',
 							deliveryService: function($stateParams, deliveryServiceService) {
 								return deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
 							},
+							origin: function($stateParams, originService) {
+								return originService.getOrigins({ deliveryservice: $stateParams.deliveryServiceId, primary: true })
+							},
 							type: function($stateParams) {
 								return $stateParams.type;
 							},


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services