diff options
| author | Tom Christie | 2015-03-04 15:51:00 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-03-04 15:51:00 +0000 |
| commit | 18cc0230bff436da2f26b2b25034cece32c9f5d0 (patch) | |
| tree | f5648574b0d80b8d4b236d05110c59cc5d54eda6 /rest_framework/settings.py | |
| parent | 5aa204e94f3173e8bc20439033a5d613625b1311 (diff) | |
| download | django-rest-framework-18cc0230bff436da2f26b2b25034cece32c9f5d0.tar.bz2 | |
Clean up pagination attributes
Diffstat (limited to 'rest_framework/settings.py')
| -rw-r--r-- | rest_framework/settings.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/rest_framework/settings.py b/rest_framework/settings.py index 394b1262..a3e9f590 100644 --- a/rest_framework/settings.py +++ b/rest_framework/settings.py @@ -61,9 +61,7 @@ DEFAULTS = { 'NUM_PROXIES': None, # Pagination - 'PAGINATE_BY': None, - 'PAGINATE_BY_PARAM': None, - 'MAX_PAGINATE_BY': None, + 'PAGE_SIZE': None, # Filtering 'SEARCH_PARAM': 'search', @@ -117,7 +115,12 @@ DEFAULTS = { 'UNICODE_JSON': True, 'COMPACT_JSON': True, 'COERCE_DECIMAL_TO_STRING': True, - 'UPLOADED_FILES_USE_URL': True + 'UPLOADED_FILES_USE_URL': True, + + # Pending deprecation: + 'PAGINATE_BY': None, + 'PAGINATE_BY_PARAM': None, + 'MAX_PAGINATE_BY': None } |