From bb5c7e4e8d783bf3a2880ab5cf1fa57fd35cd198 Mon Sep 17 00:00:00 2001 From: Mike Fogel Date: Fri, 11 Apr 2014 23:58:56 -0400 Subject: [1.7.x] Fixed #22537 -- Add tests and improved docs for field subclass with choices. Backport of 7fd1b35ed7 from master --- tests/field_subclassing/models.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests/field_subclassing/models.py') diff --git a/tests/field_subclassing/models.py b/tests/field_subclassing/models.py index c2f7e4f66b..3ed465cd7f 100644 --- a/tests/field_subclassing/models.py +++ b/tests/field_subclassing/models.py @@ -5,7 +5,7 @@ Tests for field subclassing. from django.db import models from django.utils.encoding import force_text -from .fields import SmallField, SmallerField, JSONField +from .fields import Small, SmallField, SmallerField, JSONField from django.utils.encoding import python_2_unicode_compatible @@ -22,5 +22,15 @@ class OtherModel(models.Model): data = SmallerField() +class ChoicesModel(models.Model): + SMALL_AB = Small('a', 'b') + SMALL_CD = Small('c', 'd') + SMALL_CHOICES = ( + (SMALL_AB, str(SMALL_AB)), + (SMALL_CD, str(SMALL_CD)), + ) + data = SmallField('small field', choices=SMALL_CHOICES) + + class DataModel(models.Model): data = JSONField() -- cgit v1.3