diff options
| author | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
|---|---|---|
| committer | Xavier Ordoquy | 2014-04-30 22:24:01 +0200 |
| commit | 2aca69a94601858a462060bc55154c812f70fb91 (patch) | |
| tree | 86f4d926344bea677ff8dd56505332fc16fdecc8 /tests/models.py | |
| parent | c5f68fba0638a15fa3c802f1bafc664e890611dc (diff) | |
| parent | d8fb81ceb15afe09a50584afcc466de812d30046 (diff) | |
| download | django-rest-framework-2aca69a94601858a462060bc55154c812f70fb91.tar.bz2 | |
Merge remote-tracking branch 'reference/master' into feature/pytest
Conflicts:
tests/test_serializer.py
Diffstat (limited to 'tests/models.py')
| -rw-r--r-- | tests/models.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/models.py b/tests/models.py index 6c8f2342..0256697a 100644 --- a/tests/models.py +++ b/tests/models.py @@ -143,7 +143,8 @@ class ForeignKeyTarget(RESTFrameworkModel): class ForeignKeySource(RESTFrameworkModel): name = models.CharField(max_length=100) - target = models.ForeignKey(ForeignKeyTarget, related_name='sources') + target = models.ForeignKey(ForeignKeyTarget, related_name='sources', + help_text='Target', verbose_name='Target') # Nullable ForeignKey |