From 7ebe59bfb2ec9611f7d36d55b0bad6c6216d520a Mon Sep 17 00:00:00 2001 From: cph Date: Sat, 22 Oct 2016 15:02:10 +0800 Subject: [PATCH 1/2] fix order_by_field bug --- graphene_django/filter/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphene_django/filter/fields.py b/graphene_django/filter/fields.py index bd4b44d..3a02ec3 100644 --- a/graphene_django/filter/fields.py +++ b/graphene_django/filter/fields.py @@ -14,7 +14,7 @@ class DjangoFilterConnectionField(DjangoConnectionField): self.fields = fields or type._meta.filter_fields meta = dict(model=type._meta.model, fields=self.fields, - order_by=self.order_by) + order_by_field=self.order_by) if extra_filter_meta: meta.update(extra_filter_meta) self.filterset_class = get_filterset_class(filterset_class, **meta) From b906a302150dc761cd71528b312c3ec664b97f4e Mon Sep 17 00:00:00 2001 From: cph Date: Sat, 22 Oct 2016 15:28:01 +0800 Subject: [PATCH 2/2] update DjangoFilterConnectionField tests --- graphene_django/filter/tests/test_fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/graphene_django/filter/tests/test_fields.py b/graphene_django/filter/tests/test_fields.py index ab3d677..d0d738a 100644 --- a/graphene_django/filter/tests/test_fields.py +++ b/graphene_django/filter/tests/test_fields.py @@ -66,13 +66,13 @@ def assert_arguments(field, *arguments): def assert_orderable(field): args = get_args(field) - assert 'order_by' in args, \ + assert 'order_by_field' in args, \ 'Field cannot be ordered' def assert_not_orderable(field): args = get_args(field) - assert 'order_by' not in args, \ + assert 'order_by_field' not in args, \ 'Field can be ordered'