diff options
| author | Tom Christie | 2013-06-26 21:18:13 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-06-26 21:18:13 +0100 |
| commit | 69e5e3cc0db481e4fad7ac34bf28b73f4786e790 (patch) | |
| tree | 9543d737204fa7f766f9d497117247fc92424b86 /rest_framework/serializers.py | |
| parent | 715bd47dfababd39be9b3295ada99f2107d7c00c (diff) | |
| download | django-rest-framework-69e5e3cc0db481e4fad7ac34bf28b73f4786e790.tar.bz2 | |
Use timezone aware datetimes with oauth2 provider, when supported. Closes #947.
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 5a8fd89f..023f7ccf 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -915,7 +915,10 @@ class HyperlinkedModelSerializer(ModelSerializer): view_name=self.opts.view_name, lookup_field=self.opts.lookup_field ) - fields.insert(0, 'url', url_field) + ret = self._dict_class() + ret['url'] = url_field + ret.update(fields) + fields = ret return fields |