Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/views.py

1 files changed, 33 insertions, 1 deletions

diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index acf9c46a6..e66743bf4 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2015 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2016 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -55,6 +55,33 @@ urlpatterns = patterns(
         check_rights(['change_find', 'change_own_find'])(
             views.find_source_deletion_wizard),
         name='find_source_deletion'),
+    url(r'^find_basket_creation/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.NewFindBasketView.as_view()), name='new_findbasket'),
+    url(r'^find_basket_modification_add/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.SelectBasketForManagement.as_view()),
+        name='select_findbasketforadd'),
+    url(r'^find_basket_modification_add/(?P<pk>[0-9]+)?/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.SelectItemsInBasket.as_view()),
+        name='select_itemsinbasket'),
+    url(r'^find_basket_modification_add_item/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.FindBasketAddItemView.as_view()),
+        name='add_iteminbasket'),
+    url(r'^find_basket_modification_delete_item/(?P<basket>[0-9]+)?'
+        r'/(?P<find_pk>[0-9]+)?/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.FindBasketDeleteItemView.as_view()),
+        name='delete_iteminbasket'),
+    url(r'^find_basket_list/(?P<pk>[0-9]+)?/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.FindBasketListView.as_view()),
+        name='list_iteminbasket'),
+    url(r'^find_basket_deletion/$',
+        check_rights(['change_find', 'change_own_find'])(
+            views.DeleteFindBasketView.as_view()), name='delete_findbasket'),
 )
 
 urlpatterns += patterns(
@@ -81,8 +108,13 @@ urlpatterns += patterns(
         name='get-find-full', kwargs={'full': True}),
     url(r'get-findsource/(?P<type>.+)?$',
         'get_findsource', name='get-findsource'),
+    url(r'get-findsource-full/(?P<type>.+)?$',
+        'get_findsource', name='get-findsource-full',
+        kwargs={'full': True}),
     url(r'show-findsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_findsource',
         name=models.FindSource.SHOW_URL),
+    url(r'show-find/basket-(?P<pk>.+)/(?P<type>.+)?$', 'show_findbasket',
+        name='show-findbasket'),
     url(r'show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_find',
         name=models.Find.SHOW_URL),
     url(r'show-historized-find/(?P<pk>.+)?/(?P<date>.+)?$',