summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-03 03:18:43 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-03 03:18:43 +0100
commitc32287904f82f9db1090217f2cc4a36589d16d8a (patch)
tree897092dfa26b9bce6578b03a09881733e88f9da0 /ishtar/furnitures/urls.py
parent6c5de269a1b4ffa1d374c68525870978ea872543 (diff)
downloadIshtar-c32287904f82f9db1090217f2cc4a36589d16d8a.tar.bz2
Ishtar-c32287904f82f9db1090217f2cc4a36589d16d8a.zip
Change merlin-session-wizard to django-formwizard
Diffstat (limited to 'ishtar/furnitures/urls.py')
-rw-r--r--ishtar/furnitures/urls.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/ishtar/furnitures/urls.py b/ishtar/furnitures/urls.py
index 5d1e0c710..aaa0d65c2 100644
--- a/ishtar/furnitures/urls.py
+++ b/ishtar/furnitures/urls.py
@@ -21,20 +21,22 @@ from django.conf.urls.defaults import *
from ishtar.urls import BASE_URL
from menus import menu
+from forms import file_creation_wizard
urlpatterns, actions = [], []
+urlpatterns = patterns('',
+ url(r'^file_creation/(?P<step>.+)$', file_creation_wizard,
+ name='file_creation'),
+ )
for section in menu.childs:
for menu_item in section.childs:
actions.append(menu_item.idx)
actions = r"|".join(actions)
urlpatterns += patterns('ishtar.furnitures.views',
- url(BASE_URL + r'(?P<action_slug>' + actions + r')/(?P<slug>[A-Za-z0-9_-]+)/' +\
- r'(?P<obj_id>\d)/$', 'action', name='action-bounded-form'),
- url(BASE_URL + r'(?P<action_slug>' + actions + r')/(?P<slug>[A-Za-z0-9_-]+)/$',
- 'action', name='action-form'),
- url(BASE_URL + r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
+ url(BASE_URL + r'(?P<action_slug>' + actions + r')/$', 'action',
+ name='action'),
url(BASE_URL + r'autocomplete-persone/$', 'autocomplete_person',
name='autocomplete-person'),
url(BASE_URL + r'autocomplete-town/$', 'autocomplete_town',