Skip to content

Use JSONAPIMeta in models to determine the resource name #197

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

Merged
merged 8 commits into from
Jan 26, 2016

Conversation

jerel
Copy link
Member

@jerel jerel commented Jan 25, 2016

Replaces #152

@scottfisk
Copy link
Contributor

Ill try to take a look at the merge conflicts today.

scottfisk and others added 7 commits January 26, 2016 10:47
replaced other usages of getting model type by __name__
This isnt required anymore as the get_resource_type calls handle this
added view precedence test

Use py.test client over drf client to fix Django 1.7 tests
@scottfisk scottfisk force-pushed the feature/compound_documents branch from 836391f to 008f4df Compare January 26, 2016 16:04
@scottfisk
Copy link
Contributor

@jerel resolved the conflicts, squashed a few commits, and added missing docs.

@jerel
Copy link
Member Author

jerel commented Jan 26, 2016

@scottfisk thanks so much! Sorry for the lengthy merge accept that we've put you through :)

@jerel
Copy link
Member Author

jerel commented Jan 26, 2016

I'll merge as soon as Travis gets done running the tests

jerel added a commit that referenced this pull request Jan 26, 2016
Use JSONAPIMeta in models to determine the resource name
@jerel jerel merged commit 4488068 into django-json-api:develop Jan 26, 2016
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