Skip to content

Add choice field param for all fields #65

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.

Sign up for GitHub

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

Open
liuliqiang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add choice field param for all fields #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7eea77
Add param for all fields
liuliqiang Jun 19, 2016
b070a7b
fix: python2.6 using {0} instead of {}
Jun 20, 2016
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
7 changes: 7 additions & 0 deletions redisco/models/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,14 @@ def __init__(self,
required=False,
validator=None,
unique=False,
choices=None,
default=None):
self.name = name
self.indexed = indexed
self.required = required
self.validator = validator
self.default = default
self.choices = choices
self.unique = unique

def __get__(self, instance, owner):
Expand Down Expand Up @@ -100,6 +102,11 @@ def validate(self, instance):
r = self.validator(self.name, val)
if r:
errors.extend(r)
# validate by choices
if self.choices:
if val is None or val not in self.choices:
errors.append(
(self.name, "should in choice: {0}".format(self.choices)))
if errors:
raise FieldValidationError(errors)

Expand Down
17 changes: 16 additions & 1 deletion redisco/models/basetests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class Person(models.Model):
first_name = models.CharField(required=True)
last_name = models.CharField()
active = models.BooleanField(default=False)
active = models.BooleanField(default=False)

def full_name(self):
return "%s %s" % (self.first_name, self.last_name,)
Expand Down Expand Up @@ -396,6 +396,21 @@ class Person(models.Model):
self.assertFalse(p.is_valid())
self.assertTrue(('name', 'required') in p.errors)

def test_choices(self):
class Person(models.Model):
name = models.CharField(required=True)
sex = models.CharField(choices=["Male", "Female"])
p = Person(name="Tyrael", sex="Male")
self.assertTrue(p.is_valid())

p = Person(name="Tyrael")
self.assertFalse(p.is_valid())
self.assertTrue(('sex', 'should in choice: ["Male", "Female"]'))

p = Person(name="Tyrael", sex="Unknown")
self.assertFalse(p.is_valid())
self.assertTrue(('sex', 'should in choice: ["Male", "Female"]'))

def test_errors(self):
class Person(models.Model):
name = models.CharField(required=True, unique=True)
Expand Down