-
Notifications
You must be signed in to change notification settings - Fork 298
Issue #337 #366
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
Issue #337 #366
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
aa962c1
Missing dependancy
jsenecal da0c94c
Add Django Debug Toolbar, and add a failing test setting out our perf...
aidanlister 1d84c80
Add a helper for specifying a prefetch_for_related attribute on your ...
aidanlister 9e284f4
Merge branch 'issue-337' into feature/add-ddt-pylint-and-test
jsenecal b4999e4
Merge pull request #364 from ABASystems/feature/add-ddt-pylint-and-test
jsenecal cacca2e
Trying to make isort happy
jsenecal 5a7d73a
Merge pull request #365 from ABASystems/feature/auto-prefetch-helpers
jsenecal e96fe6c
Adding `select_related` and `prefetch_for_includes` to `CommentViewSet`
jsenecal 8fdbc0a
Fixes ImportError on TravisCI
jsenecal 46c3809
E265 block comment should start with '# '
jsenecal 3c24093
E501 line too long (121 > 100 characters)
jsenecal 151bdb9
F401 '..factories' imported but unused
jsenecal 844e88e
Imports are (now) correctly sorted as per isort.
jsenecal 07f67a3
Package name, not module name... woops!
jsenecal f924ac8
More of this isort madness
jsenecal 97b6dd3
Use forms in the browsable API
jsenecal f0bda69
Updating docs to reflect the added ModelViewSet helper
jsenecal 63020b4
Including packaging to the isort command that checks example.
jsenecal a7130b9
Merge branch 'issue-337' of github.com:django-json-api/django-rest-fr...
jsenecal 7343def
Updating docs to give some context.
jsenecal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Trying to make isort happy
- Loading branch information
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,16 +2,16 @@ | |
import json | ||
from collections import OrderedDict | ||
|
||
import six | ||
|
||
import inflection | ||
import six | ||
from django.core.exceptions import ImproperlyConfigured | ||
from django.core.urlresolvers import NoReverseMatch | ||
from django.utils.translation import ugettext_lazy as _ | ||
from rest_framework.fields import MISSING_ERROR_MESSAGE | ||
from rest_framework.relations import MANY_RELATION_KWARGS, PrimaryKeyRelatedField | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👏 I'm a fan of any time a |
||
from rest_framework.reverse import reverse | ||
from rest_framework.serializers import Serializer | ||
|
||
from rest_framework_json_api.exceptions import Conflict | ||
from rest_framework_json_api.utils import ( | ||
Hyperlink, | ||
|
2 changes: 1 addition & 1 deletion
rest_framework_json_api/serializers.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.