|
8 | 8 | import types |
9 | 9 |
|
10 | 10 | from django.core.serializers.json import DjangoJSONEncoder |
11 | | -from django.core.urlresolvers import RegexURLPattern, RegexURLResolver |
| 11 | +from django.core.urlresolvers import RegexURLPattern, RegexURLResolver, get_script_prefix |
12 | 12 | from django.utils import six |
13 | 13 |
|
14 | 14 | from djangojs.conf import settings |
@@ -53,6 +53,9 @@ def urls_as_json(): |
53 | 53 | def _get_urls_for_pattern(pattern, prefix='', namespace=None): |
54 | 54 | urls = {} |
55 | 55 |
|
| 56 | + if prefix is '': |
| 57 | + prefix = get_script_prefix() |
| 58 | + |
56 | 59 | if issubclass(pattern.__class__, RegexURLPattern): |
57 | 60 | if settings.JS_URLS_UNNAMED: |
58 | 61 | mod_name, obj_name = pattern.callback.__module__, pattern.callback.__name__ |
@@ -99,7 +102,7 @@ def _get_urls_for_pattern(pattern, prefix='', namespace=None): |
99 | 102 | full_url = full_url.replace(el, "<>") # replace by a empty parameter name |
100 | 103 | # Unescape charaters |
101 | 104 | full_url = RE_ESCAPE.sub(r'\1', full_url) |
102 | | - urls[pattern_name] = "/" + full_url |
| 105 | + urls[pattern_name] = full_url |
103 | 106 | elif (CMS_APP_RESOLVER) and (issubclass(pattern.__class__, AppRegexURLResolver)): # hack for django-cms |
104 | 107 | for p in pattern.url_patterns: |
105 | 108 | urls.update(_get_urls_for_pattern(p, prefix=prefix, namespace=namespace)) |
|
0 commit comments