From 2741a979ea064c66f6352eb684f6d04c94fa30e9 Mon Sep 17 00:00:00 2001
From: Jeremy Mitchell <mitchell852@gmail.com>
Date: Tue, 7 Jul 2020 19:29:15 -0600
Subject: [PATCH] server is now an array of one as opposed to an object due to
 the removal of serverservice.getServer() in favor of
 serverservice.getServers(id:x)

---
 .../TableServerDeliveryServicesController.js         | 12 ++++++------
 .../table.serverDeliveryServices.tpl.html            |  2 +-
 .../TableServerServerCapabilitiesController.js       |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
index aefcf55091..0d0fc9021a 100644
--- a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
+++ b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
@@ -78,10 +78,10 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $
 		});
 	};
 
-	$scope.cloneDsAssignments = function(server) {
+	$scope.cloneDsAssignments = function() {
 		var params = {
 			title: 'Clone Delivery Service Assignments',
-			message: "Please select another " + server.type + " cache to assign these " + deliveryServices.length + " delivery services to." +
+			message: "Please select another " + $scope.server.type + " cache to assign these " + deliveryServices.length + " delivery services to." +
 				"<br>" +
 				"<br>" +
 				"<strong>WARNING THIS CANNOT BE UNDONE</strong> - Any delivery services currently assigned to the selected cache will be lost and replaced with these " + deliveryServices.length + " delivery service assignments.",
@@ -96,7 +96,7 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $
 					return params;
 				},
 				collection: function(serverService) {
-					return serverService.getServers({ type: server.type, orderby: 'hostName', cdn: server.cdnId }).then(function(xs){return xs.filter(function(x){return x.id!=server.id})}, function(err){throw err});
+					return serverService.getServers({ type: $scope.server.type, orderby: 'hostName', cdn: $scope.server.cdnId }).then(function(xs){return xs.filter(function(x){return x.id!=$scope.server.id})}, function(err){throw err});
 				}
 			}
 		});
@@ -120,10 +120,10 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $
 			size: 'lg',
 			resolve: {
 				server: function() {
-					return server;
+					return $scope.server;
 				},
 				deliveryServices: function(deliveryServiceService) {
-					return deliveryServiceService.getDeliveryServices({ cdn: server.cdnId });
+					return deliveryServiceService.getDeliveryServices({ cdn: $scope.server.cdnId });
 				},
 				assignedDeliveryServices: function() {
 					return deliveryServices;
@@ -131,7 +131,7 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $
 			}
 		});
 		modalInstance.result.then(function(selectedDsIds) {
-			serverService.assignDeliveryServices(server, selectedDsIds, true, false)
+			serverService.assignDeliveryServices($scope.server, selectedDsIds, true, false)
 				.then(
 					function() {
 						$scope.refresh();
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 7d4d6a7c44..5ee68e927a 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
@@ -47,7 +47,7 @@
                 </button>
                 <ul class="dropdown-menu-right dropdown-menu" uib-dropdown-menu>
                     <li><a ng-click="selectDeliveryServices(server)">Link Delivery Services to Server</a></li>
-                    <li ng-if="isEdge(server) && deliveryServices.length > 0"><a class="clone-ds-assignments" ng-click="cloneDsAssignments(server)">Clone Delivery Service Assignments</a></li>
+                    <li ng-if="isEdge(server) && deliveryServices.length > 0"><a class="clone-ds-assignments" ng-click="cloneDsAssignments()">Clone Delivery Service Assignments</a></li>
                 </ul>
             </div>
         </div>
diff --git a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
index 70c3a544be..51b991a44a 100644
--- a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
+++ b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
@@ -52,7 +52,7 @@ var TableServerServerCapabilitiesController = function(server, serverCapabilitie
 			}
 		});
 		modalInstance.result.then(function(serverCapability) {
-			serverService.addServerCapability(server.id, serverCapability.name)
+			serverService.addServerCapability($scope.server.id, serverCapability.name)
 				.then(
 					function(result) {
 						messageModel.setMessages(result.alerts, false);
@@ -81,7 +81,7 @@ var TableServerServerCapabilitiesController = function(server, serverCapabilitie
 			}
 		});
 		modalInstance.result.then(function() {
-			serverService.removeServerCapability(server.id, serverCapability)
+			serverService.removeServerCapability($scope.server.id, serverCapability)
 				.then(
 					function(result) {
 						messageModel.setMessages(result.alerts, false);