summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-12-15 18:37:26 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:22 +0100
commit173db6ad38f8286db3953e5965af37b0f2d953c4 (patch)
tree803e5d2cfbf1ba8e4b4dc818027c83d8ce81516b /archaeological_warehouse
parent99b583ae953b71840f986f26f827f55d445594a4 (diff)
downloadIshtar-173db6ad38f8286db3953e5965af37b0f2d953c4.tar.bz2
Ishtar-173db6ad38f8286db3953e5965af37b0f2d953c4.zip
Fix null -> "" errors - fix tests
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r--archaeological_warehouse/models.py4
-rw-r--r--archaeological_warehouse/tests.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 8d06d0e2b..c9bd4b494 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -394,8 +394,10 @@ class Warehouse(Address, DocumentItem, GeoItem, CompleteIdentifierItem,
for k in Address.FIELDS:
if k == "alt_address_is_prefered":
setattr(self, k, False)
- else:
+ elif k in ("precise_town", "email"):
setattr(self, k, None)
+ else:
+ setattr(self, k, "")
self.save()
def get_max_division_number(self):
diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py
index c1d2e032f..b6a32f9f1 100644
--- a/archaeological_warehouse/tests.py
+++ b/archaeological_warehouse/tests.py
@@ -491,7 +491,7 @@ class WarehouseTest(TestCase):
self.assertIsNotNone(w.organization)
self.assertEqual(w.organization.name, "Hophop")
self.assertEqual(w.organization.address, "Adresse")
- self.assertIsNone(w.address)
+ self.assertEqual(w.address, "")
class ContainerTest(FindInit, TestCase):