Post rebase

apache · Oct 27, 2017 · a5a401a · a5a401a
1 parent 6e533ed
commit a5a401a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/superset/assets/visualizations/horizon.css b/superset/assets/visualizations/horizon.css
@@ -12,6 +12,6 @@
     text-shadow: 1px 1px rgba(255, 255, 255, 0.75);
 }
 
-.horizon.main {
+.horizon .slice_container {
     overflow: auto;
 }
diff --git a/superset/assets/visualizations/horizon.js b/superset/assets/visualizations/horizon.js
@@ -32,8 +32,12 @@ const horizonChart = function () {
     const horizon = d3.select(this);
     const step = width / data.length;
 
-    horizon.append('span').text(title);
-    horizon.append('span').attr('class', 'value');
+    horizon.append('span')
+    .attr('class', 'title')
+    .text(title);
+
+    horizon.append('span')
+    .attr('class', 'value');
 
     canvas = horizon.append('canvas');
 
@@ -189,7 +193,6 @@ const horizonChart = function () {
 function horizonViz(slice, payload) {
   const fd = slice.formData;
   const div = d3.select(slice.selector);
-  div.classed('main', true).style('height', slice.height());
   div.selectAll('*').remove();
   let extent;
   if (fd.horizon_color_scale === 'overall') {

diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
@@ -251,8 +251,8 @@ def expression(self):
     @property
     def data(self):
         attrs = (
-            'column_name', 'verbose_name', 'description', 'expression', 'type',
-            'filterable', 'groupby')
+            'column_name', 'verbose_name', 'description', 'expression',
+            'filterable', 'groupby', 'type')
         return {s: getattr(self, s) for s in attrs}
 
 

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -441,9 +441,6 @@ def get_sqla_query(  # sqla
             metrics_exprs.append(self.get_sqla_metric(m))
 
         metrics_dict = {m.metric_name: m for m in self.metrics}
-        for m in metrics:
-            if m not in metrics_dict:
-                raise Exception(_("Metric '{}' is not valid".format(m)))
 
         timeseries_limit_metric = metrics_dict.get(timeseries_limit_metric)
         if metrics_exprs: