diff options
| author | Tom Christie | 2012-09-19 17:14:40 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-09-19 17:14:40 +0100 | 
| commit | 9921b6bd73c5256a3b65c2a5106717ce0fc8f0cf (patch) | |
| tree | 5e2ee1b732568cf9797d95e4fa59f95f2920da32 | |
| parent | db13401af0d8c84007b8fcfafda560bef964935b (diff) | |
| download | django-rest-framework-9921b6bd73c5256a3b65c2a5106717ce0fc8f0cf.tar.bz2 | |
Use get_script_prefix to play nicely if not installed at the root.
| -rw-r--r-- | djangorestframework/utils/breadcrumbs.py | 14 | 
1 files changed, 8 insertions, 6 deletions
| diff --git a/djangorestframework/utils/breadcrumbs.py b/djangorestframework/utils/breadcrumbs.py index 84dd3dfa..71284380 100644 --- a/djangorestframework/utils/breadcrumbs.py +++ b/djangorestframework/utils/breadcrumbs.py @@ -1,4 +1,4 @@ -from django.core.urlresolvers import resolve +from django.core.urlresolvers import resolve, get_script_prefix  def get_breadcrumbs(url): @@ -6,7 +6,7 @@ def get_breadcrumbs(url):      from djangorestframework.views import APIView -    def breadcrumbs_recursive(url, breadcrumbs_list): +    def breadcrumbs_recursive(url, breadcrumbs_list, prefix):          """Add tuples of (name, url) to the breadcrumbs list, progressively chomping off parts of the url."""          try: @@ -16,7 +16,7 @@ def get_breadcrumbs(url):          else:              # Check if this is a REST framework view, and if so add it to the breadcrumbs              if isinstance(getattr(view, 'cls_instance', None), APIView): -                breadcrumbs_list.insert(0, (view.cls_instance.get_name(), url)) +                breadcrumbs_list.insert(0, (view.cls_instance.get_name(), prefix + url))          if url == '':              # All done @@ -24,9 +24,11 @@ def get_breadcrumbs(url):          elif url.endswith('/'):              # Drop trailing slash off the end and continue to try to resolve more breadcrumbs -            return breadcrumbs_recursive(url.rstrip('/'), breadcrumbs_list) +            return breadcrumbs_recursive(url.rstrip('/'), breadcrumbs_list, prefix)          # Drop trailing non-slash off the end and continue to try to resolve more breadcrumbs -        return breadcrumbs_recursive(url[:url.rfind('/') + 1], breadcrumbs_list) +        return breadcrumbs_recursive(url[:url.rfind('/') + 1], breadcrumbs_list, prefix) -    return breadcrumbs_recursive(url, []) +    prefix = get_script_prefix() +    url = url[len(prefix):] +    return breadcrumbs_recursive(url, [], prefix) | 
