Skip to content

Commit 0aedb9a

Browse files
Arun S KumarArun S Kumar
authored andcommitted
Merge remote-tracking branch 'remotes/origin/feat-mongoengine-connection-field-filters' into feat-mongoengine-connection-field-filters
# Conflicts: # graphene_mongo/fields.py # graphene_mongo/tests/models.py # graphene_mongo/tests/test_relay_query.py
1 parent b8765c6 commit 0aedb9a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

graphene_mongo/fields.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,8 @@ def registry(self):
5656

5757
@property
5858
def args(self):
59-
return to_arguments(
60-
self._base_args or OrderedDict(),
61-
dict(self.field_args, **self.reference_args, **self.filter_args)
62-
)
59+
return to_arguments(self._base_args or OrderedDict(),
60+
dict(self.field_args, **self.reference_args, **self.filter_args))
6361

6462
@args.setter
6563
def args(self, args):
@@ -85,10 +83,8 @@ def is_filterable(k):
8583
return False
8684
if isinstance(converted, (ConnectionField, Dynamic)):
8785
return False
88-
if callable(getattr(converted, 'type', None)) \
89-
and isinstance(
90-
converted.type(),
91-
(FileFieldType, PointFieldType, MultiPolygonFieldType, graphene.Union)):
86+
if callable(getattr(converted, 'type', None)) and \
87+
isinstance(converted.type(), (FileFieldType, PointFieldType, MultiPolygonFieldType, graphene.Union)):
9288
return False
9389
return True
9490

0 commit comments

Comments
 (0)