diff options
| author | Tom Christie | 2012-10-02 19:54:24 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-10-02 19:54:24 +0100 |
| commit | e1518de68fa9ad4b2628894abf17924e386ccbda (patch) | |
| tree | b1d190f6bd08ce087cf0a2d3e8cd681b5e7e7d04 /rest_framework/settings.py | |
| parent | 31b06f1721f98730556dc56927b985e4032788c3 (diff) | |
| parent | d1b99f350aded62fe480f7dc4749cd63d52715d2 (diff) | |
| download | django-rest-framework-e1518de68fa9ad4b2628894abf17924e386ccbda.tar.bz2 | |
Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2
Diffstat (limited to 'rest_framework/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index cfc89fe1..2e50e05d 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -44,13 +44,17 @@ DEFAULTS = { 'anon': None, }, + 'MODEL_SERIALIZER': 'rest_framework.serializers.ModelSerializer', + 'PAGINATION_SERIALIZER': 'rest_framework.pagination.PaginationSerializer', + 'PAGINATE_BY': 20, + 'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser', 'UNAUTHENTICATED_TOKEN': None, 'FORM_METHOD_OVERRIDE': '_method', 'FORM_CONTENT_OVERRIDE': '_content', 'FORM_CONTENTTYPE_OVERRIDE': '_content_type', - 'URL_ACCEPT_OVERRIDE': '_accept', + 'URL_ACCEPT_OVERRIDE': 'accept', 'URL_FORMAT_OVERRIDE': 'format', 'FORMAT_SUFFIX_KWARG': 'format' @@ -65,6 +69,8 @@ IMPORT_STRINGS = ( 'DEFAULT_PERMISSIONS', 'DEFAULT_THROTTLES', 'DEFAULT_CONTENT_NEGOTIATION', + 'MODEL_SERIALIZER', + 'PAGINATION_SERIALIZER', 'UNAUTHENTICATED_USER', 'UNAUTHENTICATED_TOKEN', ) |