aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/resources.py
diff options
context:
space:
mode:
authorTom Christie2012-02-21 06:09:30 -0800
committerTom Christie2012-02-21 06:09:30 -0800
commit49ebaf106d4c4357f51f6b2bbe533512340ea113 (patch)
treeddb6cb637899a327253bffc2888e376eeab4e9f1 /djangorestframework/resources.py
parent5a5f24f263c218f4f04a6ea54bfc48a2794e152b (diff)
parentf17f3886f42c2068e6e8a41c6e5fe6bfe1408add (diff)
downloaddjango-rest-framework-49ebaf106d4c4357f51f6b2bbe533512340ea113.tar.bz2
Merge pull request #175 from izquierdo/custom_reverse
Custom reverse() and drop set_script_prefix
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 cc338cc0..5e126def 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 ErrorResponse
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