Merge branch 'master' into byolken/support_pex

apache · Dec 1, 2016 · 31c66a7 · 31c66a7
2 parents 4c57caf + 7f4f250
commit 31c66a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/superset/sql_lab.py b/superset/sql_lab.py
@@ -132,7 +132,10 @@ def handle_error(msg):
         query.rows = cdf.size
     if query.select_as_cta:
         query.select_sql = '{}'.format(database.select_star(
-            query.tmp_table_name, limit=query.limit))
+            query.tmp_table_name,
+            limit=query.limit,
+            schema=database.force_ctas_schema
+        ))
     query.end_time = utils.now_as_float()
     session.flush()
 

diff --git a/superset/views.py b/superset/views.py
@@ -2598,6 +2598,8 @@ def show_traceback(self):
     @expose("/welcome")
     def welcome(self):
         """Personalized welcome page"""
+        if not g.user or not g.user.get_id():
+            return redirect(appbuilder.get_url_for_login)
         return self.render_template('superset/welcome.html', utils=utils)
 
     @has_access