Merge branch 'master' into alanna-tooltip-bug

apache · Jul 21, 2016 · 94dcd48 · 94dcd48
2 parents 1284e4d + 7bba9f7
commit 94dcd48
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
@@ -316,7 +316,10 @@ var px = (function () {
         token.find("img.loading").hide();
         var err = msg ? ('<div class="alert alert-danger">' + msg + '</div>') : "";
         if (xhr) {
-          err += '<div class="alert alert-danger">' + this.getErrorMsg(xhr) + '</div>';
+          var extendedMsg = this.getErrorMsg(xhr);
+          if (extendedMsg) {
+            err += '<div class="alert alert-danger">' + extendedMsg + '</div>';
+          }
         }
         container.html(err);
         container.show();