summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-22 12:52:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-28 11:40:17 +0100
commit50c110423360b4fe5b44409ebeb26721e929623a (patch)
tree470cd5417c723494ea9edfdc12578d765b5a655d /archaeological_warehouse
parent71f84bfa3da9db01215cc61318d6a1e3f8536c28 (diff)
downloadIshtar-50c110423360b4fe5b44409ebeb26721e929623a.tar.bz2
Ishtar-50c110423360b4fe5b44409ebeb26721e929623a.zip
Fix packaging creation and treatment tests
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r--archaeological_warehouse/urls.py3
-rw-r--r--archaeological_warehouse/wizards.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index fa895b7c4..947129c82 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -29,7 +29,8 @@ from archaeological_warehouse import models
# forms
urlpatterns = [
url(r'warehouse_packaging/(?P<step>.+)?$',
- views.warehouse_packaging_wizard, name='warehouse_packaging'),
+ check_rights(['change_find', 'change_own_find'])(
+ views.warehouse_packaging_wizard), name='warehouse_packaging'),
url(r'new-warehouse/(?P<parent_name>.+)?/$',
views.new_warehouse, name='new-warehouse'),
diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index a0d46e892..03258f1e2 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -60,6 +60,8 @@ class PackagingWizard(TreatmentWizard):
items = dct.pop('basket')
else:
dct.pop('basket')
+ if 'treatment_type_list' in dct:
+ dct.pop('treatment_type_list')
treatment = Treatment(**dct)
extra_args_for_new = {"container": dct['container']}
treatment.save(items=items, user=self.request.user,