You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by zr...@apache.org on 2021/11/05 00:47:19 UTC

[trafficcontrol] 09/21: Fix to error message not being displayed if error occurs while removing a server from a ds (#6280)

This is an automated email from the ASF dual-hosted git repository.

zrhoffman pushed a commit to branch 6.0.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit b8c46b79923f25d1753db39e7b7f2ec7e80bb25f
Author: Jeremy Mitchell <mi...@users.noreply.github.com>
AuthorDate: Wed Oct 20 10:09:47 2021 -0600

    Fix to error message not being displayed if error occurs while removing a server from a ds (#6280)
    
    * fixes missing space
    
    * fixes error message not being displayed
    
    (cherry picked from commit efed598e4bdda68faad0ec3c45881c2e206380b6)
---
 traffic_portal/app/src/common/api/DeliveryServiceService.js           | 2 +-
 .../deliveryServiceServers/TableDeliveryServiceServersController.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/traffic_portal/app/src/common/api/DeliveryServiceService.js b/traffic_portal/app/src/common/api/DeliveryServiceService.js
index 81c0f27..b162941 100644
--- a/traffic_portal/app/src/common/api/DeliveryServiceService.js
+++ b/traffic_portal/app/src/common/api/DeliveryServiceService.js
@@ -213,7 +213,7 @@ var DeliveryServiceService = function($http, locationUtils, messageModel, ENV) {
                 return result;
             },
             function(err) {
-                messageModel.setMessages(err.data.alerts, true);
+                messageModel.setMessages(err.data.alerts, false);
                 throw err;
             }
         );
diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
index 0829e8f..0522fa7 100644
--- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
+++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
@@ -50,7 +50,7 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, f
 				return !$scope.isEdge(row) && !$scope.isOrigin(row);
 			},
 			getText: function(row) {
-				return "Remove " + row.type + "Server";
+				return "Remove " + row.type + " Server";
 			}
 		});
 		$scope.contextMenuOptions.push({
@@ -65,7 +65,7 @@ var TableDeliveryServiceServersController = function(deliveryService, servers, f
 				return !$scope.isOrigin(row);
 			},
 			getText: function(row) {
-				return "Remove " + row.type + "Server";
+				return "Remove " + row.type + " Server";
 			}
 		});