hooks in api error messages to delete methods
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3f869ddd Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3f869ddd Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3f869ddd Branch: refs/heads/psql Commit: 3f869dddc60e752427da8098eaabc7061281ae28 Parents: de01156 Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Fri Oct 14 15:31:00 2016 -0600 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Fri Oct 14 15:31:00 2016 -0600 ---------------------------------------------------------------------- .../experimental/ui/app/src/common/api/ASNService.js | 4 ++-- .../experimental/ui/app/src/common/api/CDNService.js | 4 ++-- .../ui/app/src/common/api/CacheGroupService.js | 4 ++-- .../ui/app/src/common/api/DeliveryServiceService.js | 4 ++-- .../ui/app/src/common/api/DivisionService.js | 4 ++-- .../ui/app/src/common/api/LocationService.js | 4 ++-- .../ui/app/src/common/api/ParameterService.js | 4 ++-- .../ui/app/src/common/api/ProfileService.js | 4 ++-- .../experimental/ui/app/src/common/api/RegionService.js | 4 ++-- .../experimental/ui/app/src/common/api/ServerService.js | 4 ++-- .../experimental/ui/app/src/common/api/StatusService.js | 12 ++++++------ .../experimental/ui/app/src/common/api/TenantService.js | 4 ++-- .../experimental/ui/app/src/common/api/TypeService.js | 12 ++++++------ .../experimental/ui/app/src/common/api/UserService.js | 4 ++-- 14 files changed, 36 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/ASNService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js index addd29d..1edaca0 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/ASNService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/ASNService.js @@ -39,8 +39,8 @@ var ASNService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'ASN deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'ASN delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/CDNService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js index 3805859..08e1f8a 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/CDNService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/CDNService.js @@ -39,8 +39,8 @@ var CDNService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'CDN deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'CDN delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js index cd381a9..fd953cd 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/CacheGroupService.js @@ -39,8 +39,8 @@ var CacheGroupService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Cache group deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Cache group delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js index bfefe85..cdf5fd5 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/DeliveryServiceService.js @@ -39,8 +39,8 @@ var DeliveryServiceService = function(Restangular, locationUtils, messageModel) function() { messageModel.setMessages([ { level: 'success', text: 'Delivery service deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Delivery service delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js index 5ad4084..219083f 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/DivisionService.js @@ -39,8 +39,8 @@ var DivisionService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Division deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Division delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/LocationService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js index 5aceafb..6a82c51 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/LocationService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/LocationService.js @@ -40,8 +40,8 @@ var LocationService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Location deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Location delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js index 82807bf..14e6cff 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/ParameterService.js @@ -39,8 +39,8 @@ var ParameterService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Parameter deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Parameter delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js index f51575a..1b05cc8 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/ProfileService.js @@ -39,8 +39,8 @@ var ProfileService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Profile deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Profile delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/RegionService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/RegionService.js b/traffic_ops/experimental/ui/app/src/common/api/RegionService.js index 705c9cc..782e028 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/RegionService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/RegionService.js @@ -38,8 +38,8 @@ var RegionService = function(Restangular, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Region deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Region delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/ServerService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js index c8edfaa..4ed37b9 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/ServerService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/ServerService.js @@ -39,8 +39,8 @@ var ServerService = function(Restangular, locationUtils, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Server deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Server delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/StatusService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js index 6d68aee..0d16473 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/StatusService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/StatusService.js @@ -36,12 +36,12 @@ var StatusService = function(Restangular, locationUtils, messageModel) { this.deleteStatus = function(id) { return Restangular.one("statuses", id).remove() .then( - function() { - messageModel.setMessages([ { level: 'success', text: 'Status deleted' } ], true); - }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Status delete failed' } ], false); - } + function() { + messageModel.setMessages([ { level: 'success', text: 'Status deleted' } ], true); + }, + function(fault) { + messageModel.setMessages(fault.data.alerts, false); + } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/TenantService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/TenantService.js b/traffic_ops/experimental/ui/app/src/common/api/TenantService.js index d880deb..9c392a5 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/TenantService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/TenantService.js @@ -38,8 +38,8 @@ var TenantService = function(Restangular, messageModel) { function() { messageModel.setMessages([ { level: 'success', text: 'Tenant deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Tenant delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/TypeService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js index 6441223..da0f566 100644 --- a/traffic_ops/experimental/ui/app/src/common/api/TypeService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/TypeService.js @@ -36,12 +36,12 @@ var TypeService = function(Restangular, locationUtils, messageModel) { this.deleteType = function(id) { return Restangular.one("types", id).remove() .then( - function() { - messageModel.setMessages([ { level: 'success', text: 'Type deleted' } ], true); - }, - function() { - messageModel.setMessages([ { level: 'error', text: 'Type delete failed' } ], false); - } + function() { + messageModel.setMessages([ { level: 'success', text: 'Type deleted' } ], true); + }, + function(fault) { + messageModel.setMessages(fault.data.alerts, false); + } ); }; http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f869ddd/traffic_ops/experimental/ui/app/src/common/api/UserService.js ---------------------------------------------------------------------- diff --git a/traffic_ops/experimental/ui/app/src/common/api/UserService.js b/traffic_ops/experimental/ui/app/src/common/api/UserService.js index b8c010d..118abf6 100755 --- a/traffic_ops/experimental/ui/app/src/common/api/UserService.js +++ b/traffic_ops/experimental/ui/app/src/common/api/UserService.js @@ -81,8 +81,8 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat function() { messageModel.setMessages([ { level: 'success', text: 'User deleted' } ], true); }, - function() { - messageModel.setMessages([ { level: 'error', text: 'User delete failed' } ], false); + function(fault) { + messageModel.setMessages(fault.data.alerts, false); } ); };
