✨ Pre-import form: manage import

1 files changed, 3 insertions, 13 deletions

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 3e3488ae9..cc61f4da7 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -671,19 +671,9 @@ class PreImportForm(IshtarForm):
                 attrs["widget"] = getattr(forms, widget_name)
             key = f"col_{- column.col_number}"
             form_field = getattr(forms, field_name)
-            if field_name == "ChoiceField":
-                if not target.formater_type.options:
-                    continue
-                options = target.formater_type.options.split(".")
-                if len(options) == 1:
-                    app = "ishtar_common"
-                else:
-                    app = options[0]
-                model_name = options[-1]
-                try:
-                    model = apps.get_model(app, model_name)
-                except LookupError:
-                    continue
+
+            model = target.formater_type.associated_model
+            if model:
                 if target.formater_type.many_split:
                     form_field = widgets.Select2MultipleField
                 self._types.append(