You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2020/08/11 18:33:02 UTC
[trafficcontrol] branch master updated: Error message does not
display after user try to delete Region and PhysLocation and Divisions
(#4944)
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 842a4b6 Error message does not display after user try to delete Region and PhysLocation and Divisions (#4944)
842a4b6 is described below
commit 842a4b64e7353790c63465dc7dc615e3f4844679
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Tue Aug 11 12:32:48 2020 -0600
Error message does not display after user try to delete Region and PhysLocation and Divisions (#4944)
* Dont wait for navigate to show errors
* Catch uncaught errors
* Also fix regions
---
traffic_portal/app/src/common/api/DivisionService.js | 2 +-
traffic_portal/app/src/common/api/PhysLocationService.js | 2 +-
traffic_portal/app/src/common/api/RegionService.js | 2 +-
.../common/modules/form/division/edit/FormEditDivisionController.js | 3 +++
.../common/modules/form/profile/edit/FormEditProfileController.js | 3 +++
.../src/common/modules/form/region/edit/FormEditRegionController.js | 5 ++++-
6 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/traffic_portal/app/src/common/api/DivisionService.js b/traffic_portal/app/src/common/api/DivisionService.js
index 71cab04..884ce0d 100644
--- a/traffic_portal/app/src/common/api/DivisionService.js
+++ b/traffic_portal/app/src/common/api/DivisionService.js
@@ -76,7 +76,7 @@ var DivisionService = function($http, ENV, locationUtils, messageModel) {
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/api/PhysLocationService.js b/traffic_portal/app/src/common/api/PhysLocationService.js
index 5e99f9f..b4ec97b 100644
--- a/traffic_portal/app/src/common/api/PhysLocationService.js
+++ b/traffic_portal/app/src/common/api/PhysLocationService.js
@@ -77,7 +77,7 @@ var PhysLocationService = function($http, ENV, locationUtils, messageModel) {
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/api/RegionService.js b/traffic_portal/app/src/common/api/RegionService.js
index 431d28d..5b4e1b0 100644
--- a/traffic_portal/app/src/common/api/RegionService.js
+++ b/traffic_portal/app/src/common/api/RegionService.js
@@ -76,7 +76,7 @@ var RegionService = function($http, ENV, messageModel) {
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/form/division/edit/FormEditDivisionController.js b/traffic_portal/app/src/common/modules/form/division/edit/FormEditDivisionController.js
index 83a27c2..4c8e869 100644
--- a/traffic_portal/app/src/common/modules/form/division/edit/FormEditDivisionController.js
+++ b/traffic_portal/app/src/common/modules/form/division/edit/FormEditDivisionController.js
@@ -26,6 +26,9 @@ var FormEditDivisionController = function(division, $scope, $controller, $uibMod
divisionService.deleteDivision(division.id)
.then(function() {
locationUtils.navigateToPath('/divisions');
+ },
+ function() {
+ // Do nothing
});
};
diff --git a/traffic_portal/app/src/common/modules/form/profile/edit/FormEditProfileController.js b/traffic_portal/app/src/common/modules/form/profile/edit/FormEditProfileController.js
index 8870dfd..3588fab 100644
--- a/traffic_portal/app/src/common/modules/form/profile/edit/FormEditProfileController.js
+++ b/traffic_portal/app/src/common/modules/form/profile/edit/FormEditProfileController.js
@@ -27,6 +27,9 @@ var FormEditProfileController = function(profile, $scope, $controller, $uibModal
.then(function(result) {
messageModel.setMessages(result.alerts, true);
locationUtils.navigateToPath('/profiles');
+ },
+ function() {
+ // do nothing
});
};
diff --git a/traffic_portal/app/src/common/modules/form/region/edit/FormEditRegionController.js b/traffic_portal/app/src/common/modules/form/region/edit/FormEditRegionController.js
index 846fc6c..a8d3ea6 100644
--- a/traffic_portal/app/src/common/modules/form/region/edit/FormEditRegionController.js
+++ b/traffic_portal/app/src/common/modules/form/region/edit/FormEditRegionController.js
@@ -26,7 +26,10 @@ var FormEditRegionController = function(region, $scope, $controller, $uibModal,
regionService.deleteRegion(region.id)
.then(function() {
locationUtils.navigateToPath('/regions');
- });
+ },
+ function(err) {
+ // Do nothing
+ });
};
$scope.regionName = angular.copy(region.name);