diff --git a/CHANGES b/CHANGES index f0ad725..55a045c 100755 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +0.4.0 (2019-04-05) + - Changed name lookup field `{field}__gte` -> `{field}__range__gte` + +0.3.16 (2019-04-05) + - Fix problem when thousand separator is used (#18) + 0.3.15 (2019-04-05) - Added Spanish translation - Compatibility Django 2.2 diff --git a/rangefilter/filter.py b/rangefilter/filter.py index cfe529e..38cdfe2 100644 --- a/rangefilter/filter.py +++ b/rangefilter/filter.py @@ -33,8 +33,8 @@ class AdminSplitDateTime(BaseAdminSplitDateTime): class DateRangeFilter(admin.filters.FieldListFilter): def __init__(self, field, request, params, model, model_admin, field_path): - self.lookup_kwarg_gte = '{}__gte'.format(field_path) - self.lookup_kwarg_lte = '{}__lte'.format(field_path) + self.lookup_kwarg_gte = '{0}__range__gte'.format(field_path) + self.lookup_kwarg_lte = '{0}__range__lte'.format(field_path) super(DateRangeFilter, self).__init__(field, request, params, model, model_admin, field_path) self.request = request diff --git a/rangefilter/tests.py b/rangefilter/tests.py index 7395c33..c817de6 100644 --- a/rangefilter/tests.py +++ b/rangefilter/tests.py @@ -72,7 +72,7 @@ class DateFuncTestCase(TestCase): self.assertEqual(date.tzinfo, None) self.assertTrue(timezone.is_naive(date)) - @skipIf(pytz is None, "install pytz") + @skipIf(pytz is None, 'install pytz') def test_make_dt_aware_with_pytz(self): local_tz = timezone.get_current_timezone() now = datetime.datetime.now() @@ -134,8 +134,8 @@ class DateRangeFilterTestCase(TestCase): self.request_factory = RequestFactory() modeladmin = MyModelAdmin(MyModel, site) - request = self.request_factory.get('/', {'created_at__gte': self.today, - 'created_at__lte': self.tomorrow}) + request = self.request_factory.get('/', {'created_at__range__gte': self.today, + 'created_at__range__lte': self.tomorrow}) request.user = self.user changelist = self.get_changelist(request, MyModel, modeladmin) @@ -154,7 +154,7 @@ class DateRangeFilterTestCase(TestCase): self.request_factory = RequestFactory() modeladmin = MyModelAdmin(MyModel, site) - request = self.request_factory.get('/', {'created_at__gte': self.today}) + request = self.request_factory.get('/', {'created_at__range__gte': self.today}) request.user = self.user changelist = self.get_changelist(request, MyModel, modeladmin) @@ -173,8 +173,8 @@ class DateRangeFilterTestCase(TestCase): self.request_factory = RequestFactory() modeladmin = MyModelDateAdmin(MyModelDate, site) - request = self.request_factory.get('/', {'created_at__gte': self.today, - 'created_at__lte': self.tomorrow}) + request = self.request_factory.get('/', {'created_at__range__gte': self.today, + 'created_at__range__lte': self.tomorrow}) request.user = self.user changelist = self.get_changelist(request, MyModelDate, modeladmin) @@ -239,10 +239,10 @@ class DateTimeRangeFilterTestCase(TestCase): self.request_factory = RequestFactory() modeladmin = MyModelTimeAdmin(MyModel, site) - request = self.request_factory.get('/', {'created_at__gte_0': self.today, - 'created_at__gte_1': self.min_time, - 'created_at__lte_0': self.tomorrow, - 'created_at__lte_1': self.max_time}) + request = self.request_factory.get('/', {'created_at__range__gte_0': self.today, + 'created_at__range__gte_1': self.min_time, + 'created_at__range__lte_0': self.tomorrow, + 'created_at__range__lte_1': self.max_time}) request.user = self.user changelist = self.get_changelist(request, MyModel, modeladmin) @@ -261,8 +261,8 @@ class DateTimeRangeFilterTestCase(TestCase): self.request_factory = RequestFactory() modeladmin = MyModelTimeAdmin(MyModel, site) - request = self.request_factory.get('/', {'created_at__gte_0': self.today, - 'created_at__gte_1': self.min_time}) + request = self.request_factory.get('/', {'created_at__range__gte_0': self.today, + 'created_at__range__gte_1': self.min_time}) request.user = self.user changelist = self.get_changelist(request, MyModel, modeladmin)