[trafficcontrol] branch master updated: Fix injection issue (#4997)

[mitchell852]

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 f31a99c  Fix injection issue (#4997)
f31a99c is described below

commit f31a99c69b8102d10ac2dda702409523c69e45d4
Author: Steve Hamrick <shamric...@users.noreply.github.com>
AuthorDate: Mon Aug 31 14:15:06 2020 -0600

    Fix injection issue (#4997)
---
 .../deliveryService/clone/FormCloneDeliveryServiceController.js     | 6 +++---
 .../form/deliveryService/new/FormNewDeliveryServiceController.js    | 3 ++-
 .../app/src/modules/private/deliveryServices/clone/index.js         | 5 ++++-
 3 files changed, 9 insertions(+), 5 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 b1b30cf..8d3fea2 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, origin, 
type, types, $scope, $controller) {
+var FormCloneDeliveryServiceController = function(deliveryService, origin, 
topologies, type, types, $scope, $controller) {
 
        // extends the FormNewDeliveryServiceController to inherit common 
methods
-       angular.extend(this, $controller('FormNewDeliveryServiceController', { 
deliveryService: deliveryService, origin: origin, type: type, types: types, 
$scope: $scope }));
+       angular.extend(this, $controller('FormNewDeliveryServiceController', { 
deliveryService: deliveryService, origin: origin, type: type, topologies: 
topologies, types: types, $scope: $scope }));
 
        $scope.deliveryServiceName = deliveryService.xmlId + ' clone';
 
@@ -40,5 +40,5 @@ var FormCloneDeliveryServiceController = 
function(deliveryService, origin, type,
 
 };
 
-FormCloneDeliveryServiceController.$inject = ['deliveryService', 'origin', 
'type', 'types', '$scope', '$controller'];
+FormCloneDeliveryServiceController.$inject = ['deliveryService', 'origin', 
'topologies', 'type', 'types', '$scope', '$controller'];
 module.exports = FormCloneDeliveryServiceController;
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 493f5d8..a38e337 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
@@ -20,7 +20,8 @@
 var FormNewDeliveryServiceController = function(deliveryService, origin, 
topologies, type, types, $scope, $controller, $uibModal, $anchorScroll, 
locationUtils, deliveryServiceService, deliveryServiceRequestService, 
messageModel, propertiesModel, userModel) {
 
        // extends the FormDeliveryServiceController to inherit common methods
-       angular.extend(this, $controller('FormDeliveryServiceController', { 
deliveryService: deliveryService, dsCurrent: deliveryService, origin: origin, 
topologies: topologies, type: type, types: types, $scope: $scope }));
+       angular.extend(this, $controller('FormDeliveryServiceController', { 
deliveryService: deliveryService,
+               dsCurrent: deliveryService, origin: origin, topologies: 
topologies, type: type, types: types, $scope: $scope }));
 
        $scope.deliveryServiceName = 'New';
 
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 c24dd0f..fa188e8 100644
--- a/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js
+++ b/traffic_portal/app/src/modules/private/deliveryServices/clone/index.js
@@ -48,7 +48,10 @@ module.exports = 
angular.module('trafficPortal.private.deliveryServices.clone',
                                                                return 
deliveryServiceService.getDeliveryService($stateParams.deliveryServiceId);
                                                        },
                                                        origin: 
function($stateParams, originService) {
-                                                               return 
originService.getOrigins({ deliveryservice: $stateParams.deliveryServiceId, 
primary: true })
+                                                               return 
originService.getOrigins({ deliveryservice: $stateParams.deliveryServiceId, 
primary: true });
+                                                       },
+                                                       topologies: 
function(topologyService) {
+                                                               return 
topologyService.getTopologies();
                                                        },
                                                        type: 
function($stateParams) {
                                                                return 
$stateParams.type;