Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 38 insertions, 1 deletions

diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 9094f0a91..133d4ae79 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -19,8 +19,9 @@
 
 from django.conf.urls.defaults import *
 
-# from ishtar_common.wizards import check_rights
+from ishtar_common.wizards import check_rights
 import views
+from archaeological_warehouse import models
 
 # be carreful: each check_rights must be relevant with ishtar_menu
 
@@ -35,12 +36,48 @@ urlpatterns += patterns(
     'archaeological_warehouse.views',
     url(r'new-warehouse/(?P<parent_name>.+)?/$',
         'new_warehouse', name='new-warehouse'),
+    url(r'^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_warehouse',
+        name=models.Warehouse.SHOW_URL),
     url(r'autocomplete-warehouse/$', 'autocomplete_warehouse',
         name='autocomplete-warehouse'),
     url(r'new-container/(?P<parent_name>.+)?/$',
         'new_container', name='new-container'),
     url(r'get-container/$', 'get_container',
         name='get-container'),
+    url(r'get-warehouse/(?P<type>.+)?$', 'get_warehouse',
+        name='get-warehouse'),
     url(r'autocomplete-container/?$',
         'autocomplete_container', name='autocomplete-container'),
+    url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_container',
+        name=models.Container.SHOW_URL),
+    url(r'^warehouse_search/(?P<step>.+)?$',
+        check_rights(['view_warehouse', 'view_own_warehouse'])(
+            views.warehouse_search_wizard), name='warehouse_search'),
+    url(r'^warehouse_creation/(?P<step>.+)?$',
+        check_rights(['add_warehouse'])(
+            views.warehouse_creation_wizard), name='warehouse_creation'),
+    url(r'^warehouse_modification/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.warehouse_modification_wizard),
+        name='warehouse_modification'),
+    url(r'^warehouse_deletion/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.warehouse_deletion_wizard),
+        name='warehouse_deletion'),
+    url(r'^container_search/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.container_search_wizard),
+        name='container_search'),
+    url(r'^container_creation/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.container_creation_wizard),
+        name='container_creation'),
+    url(r'^container_modification/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.container_modification_wizard),
+        name='container_modification'),
+    url(r'^container_deletion/(?P<step>.+)?$',
+        check_rights(['change_warehouse'])(
+            views.container_deletion_wizard),
+        name='container_deletion'),
 )