From 6b4c89392a05f85cfd2f1ac1af8eb4cb4f6030c6 Mon Sep 17 00:00:00 2001 From: Alexander Ushanov Date: Tue, 10 Jul 2018 21:49:14 +0300 Subject: [PATCH 1/5] Fixed version comparsion --- chartkick/ext.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chartkick/ext.py b/chartkick/ext.py index 4feea9a..ec0cd9e 100644 --- a/chartkick/ext.py +++ b/chartkick/ext.py @@ -5,6 +5,7 @@ import json import itertools import functools +from distutils.version import LooseVersiond import jinja2 from jinja2 import nodes @@ -68,7 +69,7 @@ def _chart_support(self, name, data, caller, **kwargs): options.update(name=name, id=id) # jinja2 prepends 'l_' or 'l_{{ n }}'(ver>=2.9) to keys - if jinja2.__version__ >= '2.9': + if LooseVersion(jinja2.__version__) >= LooseVersion('2.9'): kwargs = dict((k[4:], v) for (k, v) in kwargs.items()) else: kwargs = dict((k[2:], v) for (k, v) in kwargs.items()) From ad14515de57ac8105e9b90fd76d824f2bd9266a7 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 10 Jul 2018 21:57:02 +0300 Subject: [PATCH 2/5] Update ext.py Fixed --- chartkick/ext.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chartkick/ext.py b/chartkick/ext.py index ec0cd9e..3a998e7 100644 --- a/chartkick/ext.py +++ b/chartkick/ext.py @@ -69,7 +69,7 @@ def _chart_support(self, name, data, caller, **kwargs): options.update(name=name, id=id) # jinja2 prepends 'l_' or 'l_{{ n }}'(ver>=2.9) to keys - if LooseVersion(jinja2.__version__) >= LooseVersion('2.9'): + if LooseVersiond(jinja2.__version__) >= LooseVersiond('2.9'): kwargs = dict((k[4:], v) for (k, v) in kwargs.items()) else: kwargs = dict((k[2:], v) for (k, v) in kwargs.items()) From f27874a7a192a422751455ea7840db9500904309 Mon Sep 17 00:00:00 2001 From: Alexander Ushanov Date: Tue, 10 Jul 2018 22:21:11 +0300 Subject: [PATCH 3/5] Fixed version comparsion --- chartkick/ext.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chartkick/ext.py b/chartkick/ext.py index 3a998e7..3a66297 100644 --- a/chartkick/ext.py +++ b/chartkick/ext.py @@ -5,7 +5,7 @@ import json import itertools import functools -from distutils.version import LooseVersiond +from distutils.version import LooseVersion import jinja2 from jinja2 import nodes @@ -69,7 +69,7 @@ def _chart_support(self, name, data, caller, **kwargs): options.update(name=name, id=id) # jinja2 prepends 'l_' or 'l_{{ n }}'(ver>=2.9) to keys - if LooseVersiond(jinja2.__version__) >= LooseVersiond('2.9'): + if LooseVersion(jinja2.__version__) >= LooseVersion('2.9'): kwargs = dict((k[4:], v) for (k, v) in kwargs.items()) else: kwargs = dict((k[2:], v) for (k, v) in kwargs.items()) From 1f9411e35c6f551a52d86d765ca7b5cd20389ccd Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 12 Jul 2018 21:00:17 +0300 Subject: [PATCH 4/5] Removed hardcoded redifinition of time.displayFormat --- chartkick/js/chartkick.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/chartkick/js/chartkick.js b/chartkick/js/chartkick.js index 474ee4c..48deafd 100644 --- a/chartkick/js/chartkick.js +++ b/chartkick/js/chartkick.js @@ -1273,11 +1273,9 @@ options.scales.xAxes[0].time.unit = "day"; step = 1; } else if (hour || timeDiff > 0.5) { - options.scales.xAxes[0].time.displayFormats = {hour: "MMM D, h a"}; options.scales.xAxes[0].time.unit = "hour"; step = 1 / 24.0; } else if (minute) { - options.scales.xAxes[0].time.displayFormats = {minute: "h:mm a"}; options.scales.xAxes[0].time.unit = "minute"; step = 1 / 24.0 / 60.0; } From 8280df8444291ba78d34b8a33911708eab33c7c1 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 24 Oct 2018 15:01:36 +0300 Subject: [PATCH 5/5] Update ext.py --- chartkick/ext.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/chartkick/ext.py b/chartkick/ext.py index 3a66297..95367cd 100644 --- a/chartkick/ext.py +++ b/chartkick/ext.py @@ -68,11 +68,7 @@ def _chart_support(self, name, data, caller, **kwargs): options = dict(self.environment.options) options.update(name=name, id=id) - # jinja2 prepends 'l_' or 'l_{{ n }}'(ver>=2.9) to keys - if LooseVersion(jinja2.__version__) >= LooseVersion('2.9'): - kwargs = dict((k[4:], v) for (k, v) in kwargs.items()) - else: - kwargs = dict((k[2:], v) for (k, v) in kwargs.items()) + kwargs = dict((k[4:], v) for (k, v) in kwargs.items()) if self._library is None: self._library = self.load_library()