diff --git a/graphene_django/filter/utils.py b/graphene_django/filter/utils.py index 1295d2a..cb5d4f9 100644 --- a/graphene_django/filter/utils.py +++ b/graphene_django/filter/utils.py @@ -20,8 +20,9 @@ def make_qs(filters): filters.pop(item[0]) filters[item[0].split("__")[0]] = item[1] elif item[0].endswith('__has'): - filters.pop(item[0]) relationship_filters[item[0].split("__")[0]] = item[1] + for item in relationship_filters.items(): + filters.pop(item[0]+'__has') base_filters = reduce(lambda init, nx: init & Q(**{nx[0]: nx[1]}), filters.items(), Q()) return base_filters, relationship_filters diff --git a/graphene_django/forms/converter.py b/graphene_django/forms/converter.py index 4a1cc19..14da0e4 100644 --- a/graphene_django/forms/converter.py +++ b/graphene_django/forms/converter.py @@ -47,7 +47,7 @@ def convert_form_field_to_string(field): @convert_form_field.register(forms.UUIDField) @convert_form_field.register(RelationshipDefinition) def convert_form_field_to_uuid(field): - return UUID(description=field.help_text) + return UUID() @convert_form_field.register(IntegerProperty)