aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/resources.py
diff options
context:
space:
mode:
authorTom Christie2012-02-21 20:12:14 +0000
committerTom Christie2012-02-21 20:12:14 +0000
commitaf9e4f69d732cc643d6ec7ae13d4a19ac0332d44 (patch)
tree9d3fb9a8aebc520716e7f83075ef83e8102b5952 /djangorestframework/resources.py
parent21fcd3a90631e96e3fa210dd526abab9571ad6e1 (diff)
downloaddjango-rest-framework-af9e4f69d732cc643d6ec7ae13d4a19ac0332d44.tar.bz2
Merging master into develop
Diffstat (limited to 'djangorestframework/resources.py')
-rw-r--r--djangorestframework/resources.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/djangorestframework/resources.py b/djangorestframework/resources.py
index 15b3579d..eadc11d0 100644
--- a/djangorestframework/resources.py
+++ b/djangorestframework/resources.py
@@ -1,10 +1,10 @@
from django import forms
-from django.core.urlresolvers import reverse, get_urlconf, get_resolver, NoReverseMatch
+from django.core.urlresolvers import get_urlconf, get_resolver, NoReverseMatch
from django.db import models
from djangorestframework.response import ImmediateResponse
from djangorestframework.serializer import Serializer, _SkipField
-from djangorestframework.utils import as_tuple
+from djangorestframework.utils import as_tuple, reverse
class BaseResource(Serializer):
@@ -354,7 +354,7 @@ class ModelResource(FormResource):
instance_attrs[param] = attr
try:
- return reverse(self.view_callable[0], kwargs=instance_attrs)
+ return reverse(self.view_callable[0], self.view.request, kwargs=instance_attrs)
except NoReverseMatch:
pass
raise _SkipField