diff options
| author | Tom Christie | 2012-10-18 04:46:01 -0700 |
|---|---|---|
| committer | Tom Christie | 2012-10-18 04:46:01 -0700 |
| commit | 0c65d9babee24f7c772dde2fc98ea4fdcb2ab6aa (patch) | |
| tree | ffb4daf6f46779711b0d6e9619f85a96b80a51a9 /rest_framework/generics.py | |
| parent | e8f542aac88677cd95c473d56511cadbc0c67813 (diff) | |
| parent | fed235dd0135c3eb98bb218a51f01ace5ddd3782 (diff) | |
| download | django-rest-framework-0c65d9babee24f7c772dde2fc98ea4fdcb2ab6aa.tar.bz2 | |
Merge pull request #304 from tomchristie/consitent_settings
Make settings consistent with corrosponding view attributes
Diffstat (limited to 'rest_framework/generics.py')
| -rw-r--r-- | rest_framework/generics.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py index 59739d01..18c1033d 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -15,7 +15,7 @@ class BaseView(views.APIView): Base class for all other generic views. """ serializer_class = None - model_serializer_class = api_settings.MODEL_SERIALIZER + model_serializer_class = api_settings.DEFAULT_MODEL_SERIALIZER_CLASS def get_serializer_context(self): """ @@ -56,7 +56,7 @@ class MultipleObjectBaseView(MultipleObjectMixin, BaseView): Base class for generic views onto a queryset. """ - pagination_serializer_class = api_settings.PAGINATION_SERIALIZER + pagination_serializer_class = api_settings.DEFAULT_PAGINATION_SERIALIZER_CLASS paginate_by = api_settings.PAGINATE_BY def get_pagination_serializer_class(self): |