Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Fixes regression of the ability to add/remove a capability or a delivery service from a server #4859

Merged
ocket8888 merged 1 commit into from
Jul 13, 2020
Merged

Fixes regression of the ability to add/remove a capability or a delivery service from a server #4859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .../src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -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});
}
}
});
Expand All @@ -120,18 +120,18 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $
size: 'lg',
resolve: {
server: function() {
return server;
return $scope.server;
Copy link
Copy Markdown
Member Author

@mitchell852 mitchell852 Jul 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one actually fixes the ds/server assignment bug. the rest i just did for some reason :)

},
deliveryServices: function(deliveryServiceService) {
return deliveryServiceService.getDeliveryServices({ cdn: server.cdnId });
return deliveryServiceService.getDeliveryServices({ cdn: $scope.server.cdnId });
},
assignedDeliveryServices: function() {
return deliveryServices;
}
}
});
modalInstance.result.then(function(selectedDsIds) {
serverService.assignDeliveryServices(server, selectedDsIds, true, false)
serverService.assignDeliveryServices($scope.server, selectedDsIds, true, false)
.then(
function() {
$scope.refresh();
Expand Down
2 changes: 1 addition & 1 deletion ...app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions .../common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down