diff options
| author | Tom Christie | 2012-11-01 06:12:16 -0700 | 
|---|---|---|
| committer | Tom Christie | 2012-11-01 06:12:16 -0700 | 
| commit | aa779598aa4e979633c25b5deef69547c67d4302 (patch) | |
| tree | d675a99abc79a2832512beb2c8d822592f0fdff4 | |
| parent | 204db7bdaa59cd17f762d6cf0e6a8623c2cc9939 (diff) | |
| parent | 9a0cc7c720d40f7d2408672c49a5d8bfb62c3979 (diff) | |
| download | django-rest-framework-aa779598aa4e979633c25b5deef69547c67d4302.tar.bz2 | |
Merge pull request #352 from asfaltboy/cleanup_MultipleObjectBaseView
cleanup MultipleObjectBaseView remains
| -rw-r--r-- | docs/tutorial/3-class-based-views.md | 4 | ||||
| -rw-r--r-- | rest_framework/mixins.py | 2 | 
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorial/3-class-based-views.md b/docs/tutorial/3-class-based-views.md index a31dccb2..91ef4038 100644 --- a/docs/tutorial/3-class-based-views.md +++ b/docs/tutorial/3-class-based-views.md @@ -92,7 +92,7 @@ Let's take a look at how we can compose our views by using the mixin classes.      class SnippetList(mixins.ListModelMixin,                        mixins.CreateModelMixin, -                      generics.MultipleObjectBaseView): +                      generics.MultipleObjectAPIView):          model = Snippet          serializer_class = SnippetSerializer @@ -102,7 +102,7 @@ Let's take a look at how we can compose our views by using the mixin classes.          def post(self, request, *args, **kwargs):              return self.create(request, *args, **kwargs) -We'll take a moment to examine exactly what's happening here - We're building our view using `MultipleObjectBaseView`, and adding in `ListModelMixin` and `CreateModelMixin`. +We'll take a moment to examine exactly what's happening here - We're building our view using `MultipleObjectAPIView`, and adding in `ListModelMixin` and `CreateModelMixin`.  The base class provides the core functionality, and the mixin classes provide the `.list()` and `.create()` actions.  We're then explicitly binding the `get` and `post` methods to the appropriate actions.  Simple enough stuff so far. diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 0f2a0d93..47e4edf7 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -29,7 +29,7 @@ class CreateModelMixin(object):  class ListModelMixin(object):      """      List a queryset. -    Should be mixed in with `MultipleObjectBaseView`. +    Should be mixed in with `MultipleObjectAPIView`.      """      empty_error = u"Empty list and '%(class_name)s.allow_empty' is False."  | 
