Migration to Django 2.2 - fixes

- rel -> remote_field
- to -> model
- default initialization for historical models

1 files changed, 5 insertions, 6 deletions

diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 633d4cfea..b7653af74 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1659,12 +1659,10 @@ class Importer(object):
 
         many_values = data.pop(attribute)
         model = None
-        if hasattr(field_object, "rel"):
-            model = field_object.rel.to
+        if hasattr(field_object, "remote_field"):
+            model = field_object.remote_field.model
         elif hasattr(field_object, "related_model"):
             model = field_object.related_model
-        elif hasattr(field_object, "to"):
-            model = field_object.to
         elif hasattr(field_object, "model"):
             model = field_object.model
         if type(many_values) not in (list, tuple):
@@ -1897,12 +1895,13 @@ class Importer(object):
             # we treat only dict formated values
             return
         # put history_modifier for every created item
-        if "history_modifier" in get_all_field_names(field_object.rel.to):
+        if "history_modifier" in get_all_field_names(field_object.remote_field.model):
             data[attribute]["history_modifier"] = self.history_modifier
         try:
             c_path.append(attribute)
             data[attribute], created = self.get_object(
-                field_object.rel.to, data[attribute].copy(), c_path, idx_line=idx_line
+                field_object.remote_field.model, data[attribute].copy(), c_path,
+                idx_line=idx_line
             )
         except ImporterError as msg:
             self.errors.append((self.idx_line, None, msg))