Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #380 #396

Merged
merged 2 commits into from Nov 11, 2012
Merged

Fixes #380 #396

merged 2 commits into from Nov 11, 2012

Conversation

markotibold
Copy link
Contributor

I started porting django-fiber to 2.X and ran into this issue as well, so I fixed it.

Cheers,

Marko

@tomchristie
Copy link
Member

Great! Any idea if this fixes #384 too?

On 10 Nov 2012, at 11:27, Marko Tibold notifications@github.com wrote:

I started proting django-fiber to 2.X and ran into this issue as well, so I fixed it.

Cheers,

Marko

You can merge this Pull Request by running:

git pull https://github.com/markotibold/django-rest-framework #380
Or view, comment on, or merge it at:

#396

Commit Summary

Reproduces #380
Fixes #380
File Changes

M rest_framework/fields.py (5)
M rest_framework/tests/hyperlinkedserializers.py (33)
M rest_framework/tests/models.py (5)
Patch Links

https://github.com/tomchristie/django-rest-framework/pull/396.patch
https://github.com/tomchristie/django-rest-framework/pull/396.diff

Reply to this email directly or view it on GitHub.

@tomchristie
Copy link
Member

@markotibold Hey bud, I'm sure you've thought about this more than me so commit whenever you're happy with it.

In his snippet he also catches the case when obj exists but self.source or field_name is None, but it's not clear to me what that tries to achieve.

Sounds incorrect... I'd drop that.

markotibold added a commit that referenced this pull request Nov 11, 2012
@markotibold markotibold merged commit 02c1b59 into encode:master Nov 11, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants