diff options
| author | Tom Christie | 2012-12-06 14:35:57 -0800 |
|---|---|---|
| committer | Tom Christie | 2012-12-06 14:35:57 -0800 |
| commit | e2175eb71b3aeab4b60378302725694a1bbf6852 (patch) | |
| tree | 3611fd0a8d234f5c07355cdde444bb9ca89f8a9a /rest_framework/tests/models.py | |
| parent | 2938bc13b12ec73084c21e629bdde4a20a1de0cb (diff) | |
| parent | 1c1bd3fc5d7e65ae8c16e9946be87956c96a1723 (diff) | |
| download | django-rest-framework-e2175eb71b3aeab4b60378302725694a1bbf6852.tar.bz2 | |
Merge pull request #462 from asfaltboy/modelserializer_traverse_related
ModelSerializer traverse related
Diffstat (limited to 'rest_framework/tests/models.py')
| -rw-r--r-- | rest_framework/tests/models.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py index c35861c6..76435df8 100644 --- a/rest_framework/tests/models.py +++ b/rest_framework/tests/models.py @@ -124,8 +124,21 @@ class ActionItem(RESTFrameworkModel): # Models for reverse relations +class Person(RESTFrameworkModel): + name = models.CharField(max_length=10) + age = models.IntegerField(null=True, blank=True) + + @property + def info(self): + return { + 'name': self.name, + 'age': self.age, + } + + class BlogPost(RESTFrameworkModel): title = models.CharField(max_length=100) + writer = models.ForeignKey(Person, null=True, blank=True) def get_first_comment(self): return self.blogpostcomment_set.all()[0] @@ -145,18 +158,6 @@ class Photo(RESTFrameworkModel): album = models.ForeignKey(Album) -class Person(RESTFrameworkModel): - name = models.CharField(max_length=10) - age = models.IntegerField(null=True, blank=True) - - @property - def info(self): - return { - 'name': self.name, - 'age': self.age, - } - - # Model for issue #324 class BlankFieldModel(RESTFrameworkModel): title = models.CharField(max_length=100, blank=True) |
