From 812bddd918036b7e3eebc9785e691bce00c48ecc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Sep 2021 17:25:35 +0200 Subject: Migration to Django 2.2 - fixes - fix parcel form - fix imports --- ishtar_common/data_importer.py | 2 +- ishtar_common/wizards.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index b7653af74..9dbd45e93 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -1877,7 +1877,7 @@ class Importer(object): except Exception as e: self.errors.append((self.idx_line, None, str(e))) return - if not hasattr(field_object, "rel") or not field_object.rel: + if not hasattr(field_object, "related_model") or not field_object.related_model: return if type(data[attribute]) == list: # extract the first item from list diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index 1aafef6e7..a22901953 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -917,7 +917,7 @@ class Wizard(IshtarWizard): and ( hasattr(field, "default") and ( - not field.default + field.default is None or field.default == NOT_PROVIDED ) ) -- cgit v1.2.3