Merge branch 'develop'

1 files changed, 42 insertions, 3 deletions

diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 588c8d520..fe7b2acd2 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -45,6 +45,8 @@ urlpatterns = [
         views.find_modify, name='find_modify'),
     url(r'get-findbasket/$', views.get_find_basket,
         name='get-findbasket'),
+    url(r'get-findbasket-write/$', views.get_find_basket_for_write,
+        name='get-findbasket-write'),
     url(r'find_basket_search/(?P<step>.+)?$',
         check_rights(['view_find', 'view_own_find'])(
             views.basket_search_wizard), name='find_basket_search'),
@@ -78,9 +80,36 @@ urlpatterns = [
         check_rights(['view_find', 'view_own_find'])(
             views.FindBasketListView.as_view()),
         name='list_iteminbasket'),
-    url(r'^find_basket_deletion/$',
+    url(r'^find_basket_deletion/(?P<step>.+)?$',
         check_rights(['view_find', 'view_own_find'])(
-            views.DeleteFindBasketView.as_view()), name='delete_findbasket'),
+            views.basket_delete_wizard),
+        name='find_basket_deletion'),
+    url(r'^findbasket-qa-duplicate/(?P<pks>[0-9-]+)?/$',
+        check_rights(['view_find', 'view_own_find'])(
+            views.QAFindbasketDuplicateFormView.as_view()),
+        name='findbasket-qa-duplicate'),
+
+    url(r'^findbasket-add-treatment/(?P<pk>[0-9-]+)/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.findbasket_treatment_add),
+        name='findbasket-add-treatment'),
+    url(r'^find-add-treatment/(?P<pk>[0-9-]+)/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.find_treatment_add),
+        name='find-add-treatment'),
+    url(r'^treatmentfile-add-treatment/(?P<pk>[0-9-]+)/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.treatmentfile_treatment_add),
+        name='treatmentfile-add-treatment'),
+    url(r'^treatment-add-adminact/(?P<pk>[0-9-]+)/$',
+        check_rights(['add_administrativeact'])(
+            views.treatment_adminact_add),
+        name='treatment-add-adminact'),
+
+    url(r'^treatmentfile-add-adminact/(?P<pk>[0-9-]+)/$',
+        check_rights(['add_administrativeact'])(
+            views.treatmentfile_adminact_add),
+        name='treatmentfile-add-adminact'),
 
     url(r'^find-qa-bulk-update/(?P<pks>[0-9-]+)?/$',
         check_rights(['change_find', 'change_own_find'])(
@@ -100,10 +129,16 @@ urlpatterns = [
             views.QAFindTreatmentFormView.as_view()),
         name='find-qa-packaging'),
 
-
     url(r'^treatment_creation/(?P<step>.+)?$',
         check_rights(['change_find', 'change_own_find'])(
             views.treatment_creation_wizard), name='treatment_creation'),
+    url(r'^treatment_creation_n1/(?P<step>.+)?$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.treatment_creation_n1_wizard), name='treatment_creation_n1'),
+    url(r'^treatment_creation_1n/(?P<step>.+)?$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.treatment_creation_1n_wizard), name='treatment_creation_1n'),
+
     url(r'^treatment_modification/(?P<step>.+)?$',
         check_rights(['change_find', 'change_own_find'])(
             views.treatment_modification_wizard),
@@ -248,6 +283,10 @@ urlpatterns = [
         administrativeactfile_document,
         name='treatmentfle-administrativeact-document',
         kwargs={'treatment_file': True}),
+    url(r'autocomplete-findbasket/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.autocomplete_findbasket),
+        name='autocomplete-findbasket'),
 ]
 
 urlpatterns += get_urls_for_model(models.Find, views, own=True,