summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/forms.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-12-03 20:42:10 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:22 +0100
commit9a5545e4b6e467a99c1bca8c328f7bd76284ade9 (patch)
tree6622036e312b9c928476090be61c672c989f4a01 /archaeological_warehouse/forms.py
parentcf5c573889f4c8e7047988cbd05483c12f3ba403 (diff)
downloadIshtar-9a5545e4b6e467a99c1bca8c328f7bd76284ade9.tar.bz2
Ishtar-9a5545e4b6e467a99c1bca8c328f7bd76284ade9.zip
Fix container form with missing parents
Diffstat (limited to 'archaeological_warehouse/forms.py')
-rw-r--r--archaeological_warehouse/forms.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index 5fcc105cd..42b8e1749 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -333,7 +333,8 @@ class ContainerForm(CustomForm, ManageOldType, forms.Form):
dct['container_type'] = models.ContainerType.objects.get(
pk=dct['container_type'])
dct['location'] = models.Warehouse.objects.get(pk=dct['location'])
- dct['parent'] = models.Container.objects.get(pk=dct['parent'])
+ if dct.get("parent", None):
+ dct['parent'] = models.Container.objects.get(pk=dct['parent'])
new_item = models.Container(**dct)
new_item.save()
return new_item
@@ -603,7 +604,7 @@ class QAContainerFormMulti(QAForm):
def __init__(self, *args, **kwargs):
self.items = kwargs["items"]
super(QAContainerFormMulti, self).__init__(*args, **kwargs)
- locations = set([item.location_id for item in self.items])
+ locations = {item.location_id for item in self.items}
if len(locations) == 1 and "qalocation" in self.fields:
self.fields["qalocation"].initial = locations.pop()