diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-04 15:40:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-01-04 15:40:05 +0100 |
| commit | a2bb0b02232890c8a833233cb50fba5f49fa462a (patch) | |
| tree | 8a9ea5694e98d07f14bb2bb1474096a21c3399f4 | |
| parent | 7e367a17f40e017d48f36e4473558d87c908aa74 (diff) | |
| download | Ishtar-a2bb0b02232890c8a833233cb50fba5f49fa462a.tar.bz2 Ishtar-a2bb0b02232890c8a833233cb50fba5f49fa462a.zip | |
Correct urls
| -rw-r--r-- | ishtar/furnitures/urls.py | 2 | ||||
| -rw-r--r-- | ishtar/settings.py.example | 2 | ||||
| -rw-r--r-- | ishtar/urls.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ishtar/furnitures/urls.py b/ishtar/furnitures/urls.py index aaa0d65c2..aeaec4863 100644 --- a/ishtar/furnitures/urls.py +++ b/ishtar/furnitures/urls.py @@ -26,7 +26,7 @@ from forms import file_creation_wizard urlpatterns, actions = [], [] urlpatterns = patterns('', - url(r'^file_creation/(?P<step>.+)$', file_creation_wizard, + url(BASE_URL + r'file_creation/(?P<step>.+)$', file_creation_wizard, name='file_creation'), ) for section in menu.childs: diff --git a/ishtar/settings.py.example b/ishtar/settings.py.example index 4cb1a710c..893cfd433 100644 --- a/ishtar/settings.py.example +++ b/ishtar/settings.py.example @@ -88,7 +88,7 @@ MIDDLEWARE_CLASSES = ( ) TEMPLATE_CONTEXT_PROCESSORS = ( - 'furnitures.context_processors.get_base_context', + 'ishtar.furnitures.context_processors.get_base_context', "django.core.context_processors.auth", "django.core.context_processors.debug", "django.core.context_processors.i18n", diff --git a/ishtar/urls.py b/ishtar/urls.py index d4abb83f8..40fefc196 100644 --- a/ishtar/urls.py +++ b/ishtar/urls.py @@ -10,7 +10,7 @@ BASE_URL = r'^' + URL_PATH urlpatterns = patterns('', (BASE_URL + 'accounts/', include('registration.urls')), (BASE_URL + r'admin/', include(admin.site.urls)), - (BASE_URL, include('ishtar.furnitures.urls')), + ('', include('ishtar.furnitures.urls')), ) urlpatterns += patterns('ishtar.furnitures.views', url(BASE_URL + '$', 'index', name='start'), |