Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

choices generated only if not provided and items are tuples #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions extras_mongoengine/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ class EnumField(object):

def __init__(self, enum, *args, **kwargs):
self.enum = enum
kwargs['choices'] = [choice for choice in enum]
if 'choices' not in kwargs:
kwargs['choices'] = [(c.value, c.name) for c in enum]
super(EnumField, self).__init__(*args, **kwargs)

def __get_value(self, enum):
Expand All @@ -96,7 +97,7 @@ def validate(self, value):

def _validate(self, value, **kwargs):
return super(EnumField, self)._validate(
self.enum(self.__get_value(value)), **kwargs)
self.__get_value(value), **kwargs)


class IntEnumField(EnumField, IntField):
Expand Down