mirror of
https://github.com/graphql-python/graphene-django.git
synced 2025-07-13 17:52:19 +03:00
Merge b906a30215
into d8567f1c58
This commit is contained in:
commit
79101cd7c9
|
@ -14,7 +14,7 @@ class DjangoFilterConnectionField(DjangoConnectionField):
|
||||||
self.fields = fields or type._meta.filter_fields
|
self.fields = fields or type._meta.filter_fields
|
||||||
meta = dict(model=type._meta.model,
|
meta = dict(model=type._meta.model,
|
||||||
fields=self.fields,
|
fields=self.fields,
|
||||||
order_by=self.order_by)
|
order_by_field=self.order_by)
|
||||||
if extra_filter_meta:
|
if extra_filter_meta:
|
||||||
meta.update(extra_filter_meta)
|
meta.update(extra_filter_meta)
|
||||||
self.filterset_class = get_filterset_class(filterset_class, **meta)
|
self.filterset_class = get_filterset_class(filterset_class, **meta)
|
||||||
|
|
|
@ -66,13 +66,13 @@ def assert_arguments(field, *arguments):
|
||||||
|
|
||||||
def assert_orderable(field):
|
def assert_orderable(field):
|
||||||
args = get_args(field)
|
args = get_args(field)
|
||||||
assert 'order_by' in args, \
|
assert 'order_by_field' in args, \
|
||||||
'Field cannot be ordered'
|
'Field cannot be ordered'
|
||||||
|
|
||||||
|
|
||||||
def assert_not_orderable(field):
|
def assert_not_orderable(field):
|
||||||
args = get_args(field)
|
args = get_args(field)
|
||||||
assert 'order_by' not in args, \
|
assert 'order_by_field' not in args, \
|
||||||
'Field can be ordered'
|
'Field can be ordered'
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user