diff options
| author | Tom Christie | 2013-05-18 14:45:06 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-05-18 14:45:06 +0100 |
| commit | 304c07681d256c4e3c6e1e1485bf9b905ba431fb (patch) | |
| tree | 46c9c269d6e7b3faa8890f05e2c066420e872e55 /rest_framework/relations.py | |
| parent | 275bfa2320eeffcfd307daaf7c85faaa0f55a8ee (diff) | |
| parent | a0e3c44c99a61a6dc878308bdf0890fbb10c41e4 (diff) | |
| download | django-rest-framework-304c07681d256c4e3c6e1e1485bf9b905ba431fb.tar.bz2 | |
Merge
Diffstat (limited to 'rest_framework/relations.py')
| -rw-r--r-- | rest_framework/relations.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py index c4b790d4..884b954c 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -221,12 +221,20 @@ class PrimaryKeyRelatedField(RelatedField): def field_to_native(self, obj, field_name): if self.many: # To-many relationship - try: + + queryset = None + if not self.source: # Prefer obj.serializable_value for performance reasons - queryset = obj.serializable_value(self.source or field_name) - except AttributeError: + try: + queryset = obj.serializable_value(field_name) + except AttributeError: + pass + if queryset is None: # RelatedManager (reverse relationship) - queryset = getattr(obj, self.source or field_name) + source = self.source or field_name + queryset = obj + for component in source.split('.'): + queryset = get_component(queryset, component) # Forward relationship return [self.to_native(item.pk) for item in queryset.all()] |
