You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/07/18 14:32:21 UTC
[trafficcontrol] branch master updated: Fix TP clone DS by adding
proper DS origin resolution
This is an automated email from the ASF dual-hosted git repository.
mitchell852 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 4570de1 Fix TP clone DS by adding proper DS origin resolution
4570de1 is described below
commit 4570de1a2781c1961b89cc3832aedd3538550ee8
Author: Rawlin Peters <ra...@comcast.com>
AuthorDate: Wed Jul 18 08:26:54 2018 -0600
Fix TP clone DS by adding proper DS origin resolution
The FormCloneDeliveryServiceController was missing the resolution of the
cloned DS's primary origin.
Fixes #2552.
---
.../deliveryService/clone/FormCloneDeliveryServiceController.js | 6 +++---
.../app/src/modules/private/deliveryServices/clone/index.js | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
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 44882cf..b1b30cf 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 7e2a914..c24dd0f 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;
},