From a0ddbb9ec954a65a77350bc054b83e35bc4dffeb Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 10 Apr 2017 22:04:25 -0700
Subject: [PATCH] Make form_data dict a macro (#2585)

---
 superset/connectors/druid/models.py | 2 +-
 superset/connectors/sqla/models.py  | 4 +++-
 superset/jinja_context.py           | 1 +
 superset/viz.py                     | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 61cb3f019f..f03af3d4c9 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -709,7 +709,7 @@ class DruidDatasource(Model, BaseDatasource):
             orderby=None,
             extras=None,  # noqa
             select=None,  # noqa
-            columns=None, phase=2, client=None):
+            columns=None, phase=2, client=None, form_data=None):
         """Runs a query against Druid and returns a dataframe.
 
         This query interface is common to SqlAlchemy and Druid
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
index 92942603bd..903182de46 100644
--- a/superset/connectors/sqla/models.py
+++ b/superset/connectors/sqla/models.py
@@ -346,7 +346,8 @@ class SqlaTable(Model, BaseDatasource):
             inner_to_dttm=None,
             orderby=None,
             extras=None,
-            columns=None):
+            columns=None,
+            form_data=None):
         """Querying any sqla table from this common interface"""
 
         template_kwargs = {
@@ -355,6 +356,7 @@ class SqlaTable(Model, BaseDatasource):
             'metrics': metrics,
             'row_limit': row_limit,
             'to_dttm': to_dttm,
+            'form_data': form_data,
         }
         template_processor = self.get_template_processor(**template_kwargs)
 
diff --git a/superset/jinja_context.py b/superset/jinja_context.py
index 5bcbbd6a47..11764c027d 100644
--- a/superset/jinja_context.py
+++ b/superset/jinja_context.py
@@ -82,6 +82,7 @@ class BaseTemplateProcessor(object):
             'url_param': url_param,
             'current_user_id': current_user_id,
             'current_username': current_username,
+            'form_data': {},
         }
         self.context.update(kwargs)
         self.context.update(BASE_CONTEXT)
diff --git a/superset/viz.py b/superset/viz.py
index 6538a25e43..b4f95f2197 100755
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -178,6 +178,7 @@ class BaseViz(object):
             'timeseries_limit': limit,
             'extras': extras,
             'timeseries_limit_metric': timeseries_limit_metric,
+            'form_data': form_data,
         }
         return d