From 173db6ad38f8286db3953e5965af37b0f2d953c4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 15 Dec 2020 18:37:26 +0100 Subject: Fix null -> "" errors - fix tests --- archaeological_warehouse/models.py | 4 +++- archaeological_warehouse/tests.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'archaeological_warehouse') 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): -- cgit v1.2.3