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

[BUGFIX release] handle case where linked relationship data is null #3452

Merged
merged 1 commit into from
Jun 26, 2015
Merged

[BUGFIX release] handle case where linked relationship data is null #3452

merged 1 commit into from
Jun 26, 2015

Conversation

pangratz
Copy link
Member

This addresses #3451.

@@ -25,7 +25,7 @@ export default JSONSerializer.extend({

if (Ember.typeOf(documentHash.data) === 'object') {
documentHash.data = this._normalizeResourceHelper(documentHash.data);
} else {
} else if (Ember.typeOf(documentHash.data) === 'array') {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wecc would you prefer a more readable way without the else if, like we do in json-api-serializer/extractRelationship?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems fine

@wecc
Copy link
Contributor

wecc commented Jun 26, 2015

[BUGFIX beta]?

Edit: Hm, maybe should to into release too while we're at it.

👍

@pangratz
Copy link
Member Author

Edit: Hm, maybe should to into release too while we're at it.

You mean a PR into the release branch, right?

@wecc
Copy link
Contributor

wecc commented Jun 26, 2015

You mean a PR into the release branch, right?

No, this is fine, against mater. But [BUGFIX release] and we can cherry-pick to both release and beta.

@pangratz pangratz changed the title [FIX beta] handle case where linked relationship data is null [BUGFIX release] handle case where linked relationship data is null Jun 26, 2015
@pangratz
Copy link
Member Author

No, this is fine, against mater. But [BUGFIX release] and we can cherry-pick to both release and beta.

Gotcha. Done.

wecc added a commit that referenced this pull request Jun 26, 2015
[BUGFIX release] handle case where linked relationship data is null
@wecc wecc merged commit 7eb7302 into emberjs:master Jun 26, 2015
@wecc
Copy link
Contributor

wecc commented Jun 26, 2015

Thanks @pangratz!

@pangratz pangratz deleted the handle-null-data branch June 27, 2015 14:44
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.

2 participants