diff options
| author | Tom Christie | 2012-10-10 09:36:18 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-10-10 09:36:18 +0100 | 
| commit | 44281c39961a7fd2131a516f905cd28c0c95efcc (patch) | |
| tree | a701c1f687ac61d0aebe8dcc1ab3a85adeb41a2d | |
| parent | a3ab66eca4be63ae35ae0c7a45267c9458fd7fcf (diff) | |
| download | django-rest-framework-44281c39961a7fd2131a516f905cd28c0c95efcc.tar.bz2 | |
Remove 'tut 6 - resources' from the docs, since it doesn't exist yet
| -rw-r--r-- | docs/index.md | 2 | ||||
| -rw-r--r-- | docs/template.html | 2 | ||||
| -rw-r--r-- | docs/tutorial/5-relationships-and-hyperlinked-apis.md | 4 | ||||
| -rw-r--r-- | rest_framework/resources.py | 8 | 
4 files changed, 12 insertions, 4 deletions
| diff --git a/docs/index.md b/docs/index.md index c149d974..b3845521 100644 --- a/docs/index.md +++ b/docs/index.md @@ -69,7 +69,7 @@ The tutorial will walk you through the building blocks that make up REST framewo  * [3 - Class based views][tut-3]  * [4 - Authentication, permissions & throttling][tut-4]  * [5 - Relationships & hyperlinked APIs][tut-5] -* [6 - Resource orientated projects][tut-6] +<!-- * [6 - Resource orientated projects][tut-6]-->  ## API Guide diff --git a/docs/template.html b/docs/template.html index b8e8b0bb..016de151 100644 --- a/docs/template.html +++ b/docs/template.html @@ -43,7 +43,7 @@                    <li><a href="{{ base_url }}/tutorial/3-class-based-views{{ suffix }}">3 - Class based views</a></li>                    <li><a href="{{ base_url }}/tutorial/4-authentication-permissions-and-throttling{{ suffix }}">4 - Authentication, permissions and throttling</a></li>                    <li><a href="{{ base_url }}/tutorial/5-relationships-and-hyperlinked-apis{{ suffix }}">5 - Relationships and hyperlinked APIs</a></li> -                  <li><a href="{{ base_url }}/tutorial/6-resource-orientated-projects{{ suffix }}">6 - Resource orientated projects</a></li> +                  <!-- <li><a href="{{ base_url }}/tutorial/6-resource-orientated-projects{{ suffix }}">6 - Resource orientated projects</a></li> -->                  </ul>                </li>                <li class="dropdown"> diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md index a76f81e8..8600d5ed 100644 --- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md +++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md @@ -6,6 +6,6 @@  * Demonstrate nested relationships  * Demonstrate and describe hyperlinked relationships -Onwards to [part 6][tut-6]. +<!-- Onwards to [part 6][tut-6]. -[tut-6]: 6-resource-orientated-projects.md +[tut-6]: 6-resource-orientated-projects.md --> diff --git a/rest_framework/resources.py b/rest_framework/resources.py index 493457e3..bb3d581f 100644 --- a/rest_framework/resources.py +++ b/rest_framework/resources.py @@ -1,3 +1,5 @@ +##### RESOURCES AND ROUTERS ARE NOT YET IMPLEMENTED - PLACEHOLDER ONLY ##### +  from functools import update_wrapper  import inspect  from django.utils.decorators import classonlymethod @@ -14,6 +16,8 @@ def wrapped(source, dest):      return dest +##### RESOURCES AND ROUTERS ARE NOT YET IMPLEMENTED - PLACEHOLDER ONLY ##### +  class ResourceMixin(object):      """      Clone Django's `View.as_view()` behaviour *except* using REST framework's @@ -57,10 +61,14 @@ class ResourceMixin(object):          return view +##### RESOURCES AND ROUTERS ARE NOT YET IMPLEMENTED - PLACEHOLDER ONLY ##### +  class Resource(ResourceMixin, views.APIView):      pass +##### RESOURCES AND ROUTERS ARE NOT YET IMPLEMENTED - PLACEHOLDER ONLY ##### +  class ModelResource(ResourceMixin, views.APIView):      root_class = generics.ListCreateAPIView      detail_class = generics.RetrieveUpdateDestroyAPIView | 
