graphql-python/graphene-django
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene-django.git synced 2025-01-31 11:48:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix choices enum: if field can be blank then it isnt required (#714)

Browse Source
This commit is contained in:
Jason Kraus 2019-08-01 01:07:52 -07:00 committed by Jonathan Kim
parent 51adb3632b
commit b1a9293016
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
graphene_django/converter.py
View File

@ -73,7 +73,8 @@ def convert_django_field_with_choices(
return named_choices_descriptions[self.name] return named_choices_descriptions[self.name]
enum = Enum(name, list(named_choices), type=EnumWithDescriptionsType) enum = Enum(name, list(named_choices), type=EnumWithDescriptionsType)
converted = enum(description=field.help_text, required=not field.null) required = not (field.blank or field.null)
converted = enum(description=field.help_text, required=required)
else: else:
converted = convert_django_field(field, registry) converted = convert_django_field(field, registry)
if registry is not None: if registry is not None:

2
graphene_django/tests/models.py
View File

@ -38,7 +38,7 @@ class Reporter(models.Model):
last_name = models.CharField(max_length=30) last_name = models.CharField(max_length=30)
email = models.EmailField() email = models.EmailField()
pets = models.ManyToManyField("self") pets = models.ManyToManyField("self")
a_choice = models.CharField(max_length=30, choices=CHOICES) a_choice = models.CharField(max_length=30, choices=CHOICES, blank=True)
objects = models.Manager() objects = models.Manager()
doe_objects = DoeReporterManager() doe_objects = DoeReporterManager()

2
graphene_django/tests/test_types.py
View File

@ -171,7 +171,7 @@ type Reporter {
lastName: String! lastName: String!
email: String! email: String!
pets: [Reporter!]! pets: [Reporter!]!
aChoice: ReporterAChoice! aChoice: ReporterAChoice
reporterType: ReporterReporterType reporterType: ReporterReporterType
articles(before: String, after: String, first: Int, last: Int): ArticleConnection articles(before: String, after: String, first: Int, last: Int): ArticleConnection
} }