diff options
| author | Tom Christie | 2014-09-17 14:11:53 +0100 |
|---|---|---|
| committer | Tom Christie | 2014-09-17 14:11:53 +0100 |
| commit | c0155fd9dc654dc5932effd46a00f66495ce700b (patch) | |
| tree | 67981b2c9c055241138f359e9214d4d7db7fe565 | |
| parent | 4ddc661b01410d0073d463ae729f152cabf2ef4d (diff) | |
| download | django-rest-framework-c0155fd9dc654dc5932effd46a00f66495ce700b.tar.bz2 | |
Update comments
| -rw-r--r-- | rest_framework/serializers.py | 2 | ||||
| -rw-r--r-- | tests/test_model_field_mappings.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 40d76897..1fea1380 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -410,10 +410,12 @@ class ModelSerializer(Serializer): info = model_meta.get_field_info(self.opts.model) ret = SortedDict() + # URL field serializer_url_field = self.get_url_field() if serializer_url_field: ret[api_settings.URL_FIELD_NAME] = serializer_url_field + # Primary key field field_name = info.pk.name serializer_pk_field = self.get_pk_field(field_name, info.pk) if serializer_pk_field: diff --git a/tests/test_model_field_mappings.py b/tests/test_model_field_mappings.py index 957bf661..bae63e5a 100644 --- a/tests/test_model_field_mappings.py +++ b/tests/test_model_field_mappings.py @@ -14,7 +14,7 @@ def dedent(blocktext): return '\n'.join([line[12:] for line in blocktext.splitlines()[1:-1]]) -# Models for testing regular field mapping +# Testing regular field mappings class RegularFieldsModel(models.Model): auto_field = models.AutoField(primary_key=True) @@ -70,7 +70,7 @@ class TestRegularFieldMappings(TestCase): self.assertEqual(repr(TestSerializer()), expected) -# Model for testing relational field mapping +# Testing relational field mappings class ForeignKeyTargetModel(models.Model): name = models.CharField(max_length=100) |