Commit Graph

761 Commits

Author SHA1 Message Date
Carlton Gibson a96f93ac86 Merge pull request #503 from carltongibson/develop
0.15.1 Release
2016-09-28 21:48:14 +02:00
Carlton Gibson d6d1652c0d Change Log and Bump Version for 0.15.1 2016-09-28 21:38:02 +02:00
Carlton Gibson 153d25a29d Merge pull request #501 from rpkilby/fix-ordering-select
Fix ordering select widget
2016-09-27 20:14:12 +02:00
Carlton Gibson b473ba14a2 Merge pull request #500 from rpkilby/fix-templates
Fix rest framework template handling
2016-09-26 11:14:22 +02:00
Ryan P Kilby 48f35b2b18 Use inline templates instead of files
This eliminates the need to add 'django_filters.rest_framework' to the
INSTALLED_APPS setting. The templates are small enough that there isn't
a benefit to using separate files anyway.
2016-09-23 19:14:27 -04:00
Ryan P Kilby 9aa98cee97 Add base csv widget tests 2016-09-23 18:47:16 -04:00
Carlton Gibson 8aba6498f5 Add test showing OrderingFilter plus Select issue
ref #496
2016-09-23 18:47:16 -04:00
Ryan P Kilby 807e921608 Add CSV widget mixin with conditional rendering 2016-09-23 18:47:13 -04:00
Nicolas Delaby a695734714 Test to show that templates from drf extensions can't be loaded 2016-09-23 13:42:00 -04:00
Carlton Gibson 5e92ac6e8b Merge pull request #497 from andreage/patch-1
Update filters.txt
2016-09-23 13:34:23 +02:00
andreage 55c31cbb7c Update filters.txt 2016-09-23 13:22:32 +02:00
Carlton Gibson a02db39fcb Merge pull request #488 from carltongibson/develop
O.15 Release
2016-09-20 22:17:08 +02:00
Carlton Gibson 97f11fd7ab Bump version from 0.15 release 2016-09-20 21:57:04 +02:00
Carlton Gibson 3b9a30b113 Add thanks to @rpkilby 2016-09-20 21:56:08 +02:00
Carlton Gibson 7b904d082e Changes for 0.15 2016-09-20 21:53:58 +02:00
Carlton Gibson 7fbb49e76d Merge pull request #487 from rpkilby/warning-build
Add warnings build
2016-09-20 21:33:00 +02:00
Ryan P Kilby 69f6cf812e Fix reqs for tox, add DRF to envs 2016-09-20 15:23:22 -04:00
Carlton Gibson 55379c0f88 Merge pull request #484 from rpkilby/settings-refactor
Add settings conf, add deprecation warnings
2016-09-20 20:38:37 +02:00
Ryan P Kilby cff0b7c05e Add warnings build, update requirements
- coverage 3.7.1 => 4.0 (since py 3.2 is deprecated now)
- pytz 2015 => 2016 (fix deprecation warnings)
- remove maintainer list from test (speed up dep install)
2016-09-18 19:59:54 -04:00
Ryan P Kilby 8151cda319 Add settings deprecation docs 2016-09-16 03:13:35 -04:00
Ryan P Kilby 58114084c4 Add filters conf, add deprecation warnings 2016-09-16 03:13:35 -04:00
Carlton Gibson 83e035860d Merge pull request #485 from rpkilby/deprecation-fixes
Fix various deprecations
2016-09-16 09:04:34 +02:00
Carlton Gibson 614698af62 Merge pull request #486 from rpkilby/drf-boolean-filter
Add DRF BooleanFilter
2016-09-16 08:59:13 +02:00
Ryan P Kilby 73b2228d77 Add DRF BooleanFilter 2016-09-16 01:11:27 -04:00
Ryan P Kilby 0fead30ab5 Fix various deprecations 2016-09-14 20:07:48 -04:00
Carlton Gibson 9d3a02eebf Merge pull request #483 from rpkilby/cripsy-filtersets
Apply crispy layout to base DRF FilterSet
2016-09-14 22:25:45 +02:00
Ryan P Kilby e7bb7d9d10 Apply crispy layout to base DRF FilterSet 2016-09-14 13:20:40 -04:00
Carlton Gibson bb03006f35 Merge pull request #472 from rpkilby/rework-ordering
Deprecate ordering options, rework into filter
2016-09-06 14:58:56 +02:00
Ryan P Kilby a18b016bce Add OrderingFilter ref & migration docs 2016-09-05 11:34:03 -04:00
Ryan P Kilby 72a9406667 Deprecate Meta.order_by, order_by_field, methods 2016-09-05 11:34:03 -04:00
Ryan P Kilby 569efd4e46 Rework ordering into a filter 2016-09-05 11:33:57 -04:00
Carlton Gibson 016840bb20 Merge pull request #481 from carltongibson/rest_framework
Add Django REST Framework support
2016-09-05 12:24:02 +02:00
Ryan P Kilby 285d7f7252 Add adapted DRF docs 2016-09-04 00:28:44 -04:00
Ryan P Kilby 31c24c8f52 Add bash code blocks 2016-09-04 00:14:06 -04:00
Carlton Gibson 8f9f423941 Add DRF to test requirements 2016-09-03 23:57:05 -04:00
Carlton Gibson f665b4c463 Adjust `deprecate` calls after rebase 2016-09-03 23:53:51 -04:00
Ryan P Kilby d19c2b67b7 Add DRF 3.3, 3.4 support 2016-09-03 23:53:51 -04:00
Ryan P Kilby b3f23ef7e0 Copy DjangoFilterBackend from DRF 2016-09-03 23:53:44 -04:00
Ryan P Kilby 18040dff02 Add rest_framework.FilterSet 2016-09-03 22:16:21 -04:00
Ryan P Kilby 3bc42ac21f Refactor filter defaults and overrides
- Make FILTER_DEFAULTS a class attr. This will allow the DRF FilterSet
  to easily override the defaults, without relying on filter_overrides.
- Move filter_overrides to the meta options, provide deprecation notice.
2016-09-03 22:16:21 -04:00
Carlton Gibson d5d6500b04 Merge pull request #469 from blueyed/dynamic-filter-predicate-with-MultipleChoiceFilter
MultipleChoiceFilter: allow to override get_filter_predicate
2016-08-24 22:11:35 +02:00
Daniel Hahler 8a4837fa60 fixup! Add test_filtering_to_field_name 2016-08-24 22:00:54 +02:00
Carlton Gibson ff81c341d5 Merge pull request #475 from blueyed/tox-posargs
tox: commands: add {posargs}
2016-08-24 20:52:18 +02:00
Carlton Gibson d48aee29ff Merge pull request #474 from blueyed/fix-doc-typo
doc: fix typo with Filter.method
2016-08-24 16:03:28 +02:00
Daniel Hahler 3a94744667 tox: commands: add {posargs}
This makes `tox -e py35-django110 -- --help` etc work.
2016-08-24 15:42:36 +02:00
Daniel Hahler 8e217132ca doc: fix typo with Filter.method 2016-08-24 15:41:27 +02:00
Daniel Hahler 54f31d562f Add test_filtering_to_field_name 2016-08-24 15:35:46 +02:00
Daniel Hahler fb828f8d1b Add doc for new Model{Multiple,}ChoiceFilter 2016-08-24 14:20:59 +02:00
Daniel Hahler a93d5ad2b0 MultipleChoiceFilter: use to_field_name for lookups by default
Ref: https://github.com/carltongibson/django-filter/pull/469#issuecomment-241854666
2016-08-24 13:55:25 +02:00
Daniel Hahler 40711c5fd0 MultipleChoiceFilter: allow to override get_filter_predicate
This allows to use an annotated field easily, without overriding
`filter` altogether:

    class MyMultipleChoiceFilter(django_filters.ModelMultipleChoiceFilter):
        def get_filter_predicate(self, v):
            return {'annotated_field': v.annotated_field}

    foo = MyMultipleChoiceFilter(
        to_field_name='annotated_field',
        queryset=Model.objects.qs_with_annotated_field(),
    )
2016-08-24 13:55:25 +02:00