aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/models.py
diff options
context:
space:
mode:
authorStephan Groß2012-11-05 11:45:49 +0100
committerStephan Groß2012-11-05 11:45:49 +0100
commit44449fa1f5f2d68740c9fb6a13c8e0a0eb41434c (patch)
treec4b6d8ed8af239dd5651d9f6a18ddbfe2079bc07 /rest_framework/tests/models.py
parentff7725f05e8ca624e54d707f7c655e3d5c8b8888 (diff)
parent5b397e50ddb999f85949a7359d0a26c3531c78a9 (diff)
downloaddjango-rest-framework-44449fa1f5f2d68740c9fb6a13c8e0a0eb41434c.tar.bz2
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'rest_framework/tests/models.py')
-rw-r--r--rest_framework/tests/models.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/rest_framework/tests/models.py b/rest_framework/tests/models.py
index 415e4d06..1a0078e8 100644
--- a/rest_framework/tests/models.py
+++ b/rest_framework/tests/models.py
@@ -122,6 +122,13 @@ 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):