Merge pull request #1160 from wknet123/master-handle-rep-err

Updates for handling 404 response text. NMT
goharbor · Nov 28, 2016 · e99d4b8 · e99d4b8
2 parents 32f9fb6 + 50a0579
commit e99d4b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/ui/static/resources/js/components/replication/create-policy.directive.js b/src/ui/static/resources/js/components/replication/create-policy.directive.js
@@ -325,7 +325,12 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingAvailable = true;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
+
       vm.pingTIP = false;
     }
   }

diff --git a/src/ui/static/resources/js/components/system-management/create-destination.directive.js b/src/ui/static/resources/js/components/system-management/create-destination.directive.js
@@ -163,7 +163,11 @@
     }
     function pingDestinationFailed(data, status) {
       vm.pingTIP = false;
-      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + (data && data.length > 0 ? ':' + data : '');
+      if(status === 404) {
+        data = '';
+      }
+      vm.pingMessage = $filter('tr')('failed_to_ping_target', []) + data;
+      console.log("Failed to ping target:" + data);
     }
   }