From e15494a172f19d9388c0888fb566907aad95de0c Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 23 Feb 2012 09:21:01 +0000 Subject: Remove InstanceMixin auto-url magicks. --- examples/modelresourceexample/resources.py | 6 ++++++ examples/modelresourceexample/urls.py | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'examples/modelresourceexample') diff --git a/examples/modelresourceexample/resources.py b/examples/modelresourceexample/resources.py index 05090f8f..b74b0572 100644 --- a/examples/modelresourceexample/resources.py +++ b/examples/modelresourceexample/resources.py @@ -1,4 +1,5 @@ from djangorestframework.resources import ModelResource +from djangorestframework.reverse import reverse from modelresourceexample.models import MyModel @@ -6,3 +7,8 @@ class MyModelResource(ModelResource): model = MyModel fields = ('foo', 'bar', 'baz', 'url') ordering = ('created',) + + def url(self, instance): + return reverse('model-resource-instance', + kwargs={'id': instance.id}, + request=self.request) diff --git a/examples/modelresourceexample/urls.py b/examples/modelresourceexample/urls.py index c680dc65..c5e1f874 100644 --- a/examples/modelresourceexample/urls.py +++ b/examples/modelresourceexample/urls.py @@ -2,7 +2,10 @@ from django.conf.urls.defaults import patterns, url from djangorestframework.views import ListOrCreateModelView, InstanceModelView from modelresourceexample.resources import MyModelResource +my_model_list = ListOrCreateModelView.as_view(resource=MyModelResource) +my_model_instance = InstanceModelView.as_view(resource=MyModelResource) + urlpatterns = patterns('', - url(r'^$', ListOrCreateModelView.as_view(resource=MyModelResource), name='model-resource-root'), - url(r'^(?P[0-9]+)/$', InstanceModelView.as_view(resource=MyModelResource), name='model-resource-instance'), + url(r'^$', my_model_list, name='model-resource-root'), + url(r'^(?P[0-9]+)/$', my_model_instance, name='model-resource-instance'), ) -- cgit v1.2.3