From 890ef28b8567437093940262eb650c6608e1e675 Mon Sep 17 00:00:00 2001 From: Mardanov Timur Rustemovich Date: Tue, 20 Nov 2018 12:09:28 +0300 Subject: [PATCH] fixed field choices realisation --- graphene_django/converter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphene_django/converter.py b/graphene_django/converter.py index ec1e1e5..c3f11e2 100644 --- a/graphene_django/converter.py +++ b/graphene_django/converter.py @@ -107,8 +107,8 @@ def convert_django_field_with_choices(field, registry=None): return converted choices = getattr(field, "choices", None) if choices: - meta = field.model._meta - name = to_camel_case("{}_{}".format(meta.object_name, field.name)) + field_class = field.owner + name = to_camel_case("{}_{}".format(field_class.__name__, field.name)) choices = list(get_choices(choices)) named_choices = [(c[0], c[1]) for c in choices] named_choices_descriptions = {c[0]: c[2] for c in choices} @@ -119,7 +119,7 @@ def convert_django_field_with_choices(field, registry=None): return named_choices_descriptions[self.name] enum = Enum(name, list(named_choices), type=EnumWithDescriptionsType) - converted = enum(description=field.help_text, required=not field.null) + converted = enum(description=field.help_text, required=field.required) else: converted = convert_django_field(field, registry) if registry is not None: