From ea8a7ec1ba26393047f70bcacd335b9e22fc63b8 Mon Sep 17 00:00:00 2001
From: x4base <x4base@gmail.com>
Date: Wed, 15 Jun 2016 16:23:25 -0500
Subject: [PATCH] Redirect to druid datasource page when the user wants to add
 slice. Also, provide a link to the table page (#625)

---
 caravel/templates/caravel/add_slice.html | 6 ++++--
 caravel/views.py                         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/caravel/templates/caravel/add_slice.html b/caravel/templates/caravel/add_slice.html
index 010c3b5fe7f4f..6d74fca5bcbf8 100644
--- a/caravel/templates/caravel/add_slice.html
+++ b/caravel/templates/caravel/add_slice.html
@@ -1,4 +1,6 @@
 <script>
-  var msg = "Click on a table link to create a Slice";
-  window.location = "/r/msg/?url={{ '/tablemodelview/list/' }}&msg=" + msg;
+  var msg = "Click on a datasource link to create a Slice, " +
+          "or click on a table link <a href='/tablemodelview/list/'>here</a> " +
+          "to create a Slice for a table";
+  window.location = "/r/msg/?url={{ '/druiddatasourcemodelview/list/' }}&msg=" + msg;
 </script>
diff --git a/caravel/views.py b/caravel/views.py
index 88ba3b672b0ef..26431063453bd 100644
--- a/caravel/views.py
+++ b/caravel/views.py
@@ -674,7 +674,7 @@ def shortner(self):
     @expose("/msg/")
     def msg(self):
         """Redirects to specified url while flash a message"""
-        flash(request.args.get("msg"), "info")
+        flash(Markup(request.args.get("msg")), "info")
         return redirect(request.args.get("url"))
 
 appbuilder.add_view_no_menu(R)