diff options
Diffstat (limited to 'archaeological_files/urls.py')
| -rw-r--r-- | archaeological_files/urls.py | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index e32ab8294..a64a8b2b1 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -19,29 +19,28 @@ from django.conf.urls.defaults import * -""" -import forms +import views -# forms +# forms: urlpatterns = patterns('', - url(r'file_search/(?P<step>.+)$', - forms.file_search_wizard, name='file_search'), - url(r'file_creation/(?P<step>.+)$', - forms.file_creation_wizard, name='file_creation'), - url(r'file_modification/(?P<step>.+)$', - forms.file_modification_wizard, name='file_modification'), - url(r'file_closing/(?P<step>.+)$', - forms.file_closing_wizard, name='file_closing'), - url(r'file_deletion/(?P<step>.+)$', - forms.file_deletion_wizard, name='file_deletion'), - url(r'file_administrativeactfile/(?P<step>.+)$', - forms.file_administrativeactfile_wizard, + url(r'file_search/(?P<step>.+)?$', + views.file_search_wizard, name='file_search'), + url(r'file_creation/(?P<step>.+)?$', + views.file_creation_wizard, name='file_creation'), + url(r'file_modification/(?P<step>.+)?$', + views.file_modification_wizard, name='file_modification'), + url(r'file_closing/(?P<step>.+)?$', + views.file_closing_wizard, name='file_closing'), + url(r'file_deletion/(?P<step>.+)?$', + views.file_deletion_wizard, name='file_deletion'), + url(r'file_administrativeactfile/(?P<step>.+)?$', + views.file_administrativeactfile_wizard, name='file_administrativeactfile'), - url(r'file_administrativeactfile_modification/(?P<step>.+)$', - forms.file_administrativeactfile_modification_wizard, + url(r'file_administrativeactfile_modification/(?P<step>.+)?$', + views.file_administrativeactfile_modification_wizard, name='file_administrativeactfile_modification'), - url(r'file_administrativeactfile_deletion/(?P<step>.+)$', - forms.file_administrativeactfile_deletion_wizard, + url(r'file_administrativeactfile_deletion/(?P<step>.+)?$', + views.file_administrativeactfile_deletion_wizard, name='file_administrativeactfile_deletion'), ) @@ -61,4 +60,3 @@ urlpatterns += patterns('archaeological_files.views', url(r'revert-file/(?P<pk>.+)/(?P<date>.+)$', 'revert_file', name='revert-file'), ) -""" |