Djangoization - Major refactoring (step 10)

* Fix operation wizards
* Minor fix on other wizards

1 files changed, 18 insertions, 19 deletions

diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py
index fb3278e31..89e1a63fc 100644
--- a/archaeological_operations/urls.py
+++ b/archaeological_operations/urls.py
@@ -19,40 +19,39 @@
 
 from django.conf.urls.defaults import *
 
-"""
 import views
 
 # forms
 urlpatterns = patterns('',
-       url(r'operation_search/(?P<step>.+)$',
-           views.operation_search_wizard, name='operation_search'),
-       url(r'operation_creation/(?P<step>.+)$',
-           views.operation_creation_wizard, name='operation_creation'),
-       url(r'operation_modification/(?P<step>.+)$',
-           views.operation_modification_wizard,
-           name='operation_modification'),
-       url(r'operation_closing/(?P<step>.+)$',
-           views.operation_closing_wizard, name='operation_closing'),
-       url(r'operation_deletion/(?P<step>.+)$',
-           views.operation_deletion_wizard, name='operation_deletion'),
-       url(r'operation_administrativeactop/(?P<step>.+)$',
+       url(r'operation_administrativeactop/(?P<step>.+)?$',
            views.operation_administrativeactop_wizard,
            name='operation_administrativeactop'),
-       url(r'operation_administrativeactop_modification/(?P<step>.+)$',
+       url(r'operation_administrativeactop_modification/(?P<step>.+)?$',
            views.operation_administrativeactop_modification_wizard,
            name='operation_administrativeactop_modification'),
-       url(r'operation_administrativeactop_deletion/(?P<step>.+)$',
+       url(r'operation_administrativeactop_deletion/(?P<step>.+)?$',
            views.operation_administrativeactop_deletion_wizard,
            name='operation_administrativeactop_deletion'),
-       url(r'operation_source_creation/(?P<step>.+)$',
+       url(r'operation_source_creation/(?P<step>.+)?$',
            views.operation_source_creation_wizard,
            name='operation_source_creation'),
-       url(r'operation_source_modification/(?P<step>.+)$',
+       url(r'operation_source_modification/(?P<step>.+)?$',
            views.operation_source_modification_wizard,
            name='operation_source_modification'),
-       url(r'operation_source_deletion/(?P<step>.+)$',
+       url(r'operation_source_deletion/(?P<step>.+)?$',
            views.operation_source_deletion_wizard,
            name='operation_source_deletion'),
+       url(r'operation_search/(?P<step>.+)?$',
+           views.operation_search_wizard, name='operation_search'),
+       url(r'operation_creation/(?P<step>.+)?$',
+           views.operation_creation_wizard, name='operation_creation'),
+       url(r'operation_modification/(?P<step>.+)?$',
+           views.operation_modification_wizard,
+           name='operation_modification'),
+       url(r'operation_closing/(?P<step>.+)?$',
+           views.operation_closing_wizard, name='operation_closing'),
+       url(r'operation_deletion/(?P<step>.+)?$',
+           views.operation_deletion_wizard, name='operation_deletion'),
 )
 
 urlpatterns += patterns('archaeological_operations.views',
@@ -72,4 +71,4 @@ urlpatterns += patterns('archaeological_operations.views',
            'get_administrativeactop', name='get-administrativeactop'),
      url(r'get-operationsource/(?P<type>.+)?$',
            'get_operationsource', name='get-operationsource'),
-)"""
+)