From e9b0d70f5d8eb94d72da677846d5dab5b587e945 Mon Sep 17 00:00:00 2001
From: S.Prymak
Date: Tue, 14 Jan 2014 10:38:49 +0200
Subject: Override HyperlinkedModelSerializerOptions url field name with
 URL_FIELD_NAME setting

---
 rest_framework/settings.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index 8abaf140..ce171d6d 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -95,6 +95,7 @@ DEFAULTS = {
     'URL_FORMAT_OVERRIDE': 'format',
 
     'FORMAT_SUFFIX_KWARG': 'format',
+    'URL_FIELD_NAME': 'url',
 
     # Input and output formats
     'DATE_INPUT_FORMATS': (
-- 
cgit v1.2.3


From 2353878951b0607a95d539c27c362d0353c53119 Mon Sep 17 00:00:00 2001
From: Peter Inglesby
Date: Thu, 6 Mar 2014 21:39:44 +0000
Subject: Add SEARCH_PARAM and ORDERING_PARAM to settings

Fixes #1434---
 rest_framework/settings.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rest_framework/settings.py')

diff --git a/rest_framework/settings.py b/rest_framework/settings.py
index ce171d6d..38753c96 100644
--- a/rest_framework/settings.py
+++ b/rest_framework/settings.py
@@ -69,6 +69,10 @@ DEFAULTS = {
     'PAGINATE_BY_PARAM': None,
     'MAX_PAGINATE_BY': None,
 
+    # Filtering
+    'SEARCH_PARAM': 'search',
+    'ORDERING_PARAM': 'ordering',
+
     # Authentication
     'UNAUTHENTICATED_USER': 'django.contrib.auth.models.AnonymousUser',
     'UNAUTHENTICATED_TOKEN': None,
-- 
cgit v1.2.3