Merge branch 'feat176-network-error-message' into internal

2016-09-01 11:35:38 +12:00
parent 5c7d1c11b6 6d6a7e6923
commit fdeb4d4aeb
2 changed files with 10 additions and 4 deletions
@@ -17,9 +17,15 @@ function ($scope, Network, Messages, $state, $stateParams, errorMsgFilter) {
  $scope.remove = function remove(networkId) {
    $('#loadingViewSpinner').show();
    Network.remove({id: $stateParams.id}, function (d) {
-      $('#loadingViewSpinner').hide();
-      Messages.send("Network removed", "");
-      $state.go('networks', {});
+      var error = errorMsgFilter(d);
+      if (error) {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Error", error);
+      } else {
+        $('#loadingViewSpinner').hide();
+        Messages.send("Network deleted", $stateParams.id);
+        $state.go('networks', {});
+      }
    }, function (e) {
      $('#loadingViewSpinner').hide();
      Messages.error("Failure", e.data);
@@ -85,7 +85,7 @@ function ($scope, $state, Network, Config, Messages, errorMsgFilter) {
        Network.remove({id: network.Id}, function (d) {
          var error = errorMsgFilter(d);
          if (error) {
-            Messages.send("Error", "Unable to remove network with active endpoints");
+            Messages.send("Error", error);
          } else {
            Messages.send("Network deleted", network.Id);
            var index = $scope.networks.indexOf(network);