Merge branch 'master' into fix_warn6

apache · Jul 17, 2017 · 379502c · 379502c
2 parents dd5a6ea + 7abe2d5
commit 379502c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/superset/assets/javascripts/explore/components/ChartContainer.jsx b/superset/assets/javascripts/explore/components/ChartContainer.jsx
@@ -341,7 +341,7 @@ function mapStateToProps(state) {
     table_name: formData.datasource_name,
     viz_type: formData.viz_type,
     triggerRender: state.triggerRender,
-    datasourceType: state.datasource_type,
+    datasourceType: state.datasource.type,
     datasourceId: state.datasource_id,
   };
 }

diff --git a/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx b/superset/assets/javascripts/explore/components/ExploreViewContainer.jsx
@@ -187,7 +187,7 @@ function mapStateToProps(state) {
   const form_data = getFormDataFromControls(state.controls);
   return {
     chartStatus: state.chartStatus,
-    datasource_type: state.datasource_type,
+    datasource_type: state.datasource.type,
     controls: state.controls,
     form_data,
     standalone: state.standalone,