From ee2d3330aa612e0ae8fb30c1da19e4fd8f18fe98 Mon Sep 17 00:00:00 2001
From: x4base <x4base@gmail.com>
Date: Wed, 15 Jun 2016 16:19:50 -0500
Subject: [PATCH] Prevent the cannot-overwrite error message from being removed
 before it can be seen (#626)

---
 caravel/assets/javascripts/explore.js | 4 +++-
 caravel/views.py                      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/caravel/assets/javascripts/explore.js b/caravel/assets/javascripts/explore.js
index 73546364139b4..27faccbf0d7dd 100644
--- a/caravel/assets/javascripts/explore.js
+++ b/caravel/assets/javascripts/explore.js
@@ -64,7 +64,9 @@ function query(force, pushState) {
   }
   $('.query-and-save button').attr('disabled', 'disabled');
   $('.btn-group.results span,a').attr('disabled', 'disabled');
-  $('div.alert').remove();
+  if (force) {  // Don't hide the alert message when the page is just loaded
+    $('div.alert').remove();
+  }
   $('#is_cached').hide();
   prepForm();
   slice.render(force);
diff --git a/caravel/views.py b/caravel/views.py
index 751f62e0f0762..88ba3b672b0ef 100644
--- a/caravel/views.py
+++ b/caravel/views.py
@@ -842,7 +842,7 @@ def save_slice(self, slc):
     def overwrite_slice(self, slc):
         can_update = check_ownership(slc, raise_if_false=False)
         if not can_update:
-            flash("You cannot overwrite [{}]".format(slc))
+            flash("You cannot overwrite [{}]".format(slc), "danger")
         else:
             session = db.session()
             session.merge(slc)