Minor bug fixes

apache · Jan 12, 2016 · 2b69912 · 2b69912
1 parent ceb0dc1
commit 2b69912
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/panoramix/models.py b/panoramix/models.py
@@ -284,7 +284,7 @@ def table_link(self):
     def metrics_combo(self):
         return sorted(
             [
-                (m.metric_name, m.verbose_name)
+                (m.metric_name, m.verbose_name or m.metric_name)
                 for m in self.metrics],
             key=lambda x: x[1])
 

diff --git a/panoramix/static/panoramix.js b/panoramix/static/panoramix.js
@@ -58,7 +58,7 @@ var px = (function() {
         $('#timer').removeClass('btn-warning');
         $('#timer').addClass('btn-success');
         $('span.query').removeClass('disabled');
-        $('#json').click(function(){window.location=data.json_endpoint()});
+        $('#json').click(function(){window.location=data.json_endpoint});
         $('#standalone').click(function(){window.location=data.standalone_endpoint});
         $('#csv').click(function(){window.location=data.csv_endpoint});
         $('.btn-group.results span').removeAttr('disabled');

diff --git a/panoramix/viz.py b/panoramix/viz.py
@@ -136,6 +136,7 @@ def get_df(self, query_obj=None):
                 df.timestamp = pd.to_datetime(df.timestamp, utc=False)
                 if self.datasource.offset:
                     df.timestamp += timedelta(hours=self.datasource.offset)
+        df = df.fillna(0)
         return df
 
     @property