Prevent the cannot-overwrite error message from being removed before …

…it can be seen (#626)
apache · Jun 15, 2016 · ee2d333 · ee2d333
1 parent aa2b8b4
commit ee2d333
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)