17354 fix import with custom-field (#17368)

* 17354 fix import with custom-field

* 17354 change to use kwargs
This commit is contained in:
Arthur Hanson 2024-09-04 13:15:44 -07:00 committed by GitHub
parent 25a4140c85
commit 9e9b87d49b

View File

@ -525,23 +525,29 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel):
elif self.type == CustomFieldTypeChoices.TYPE_OBJECT: elif self.type == CustomFieldTypeChoices.TYPE_OBJECT:
model = self.related_object_type.model_class() model = self.related_object_type.model_class()
field_class = CSVModelChoiceField if for_csv_import else DynamicModelChoiceField field_class = CSVModelChoiceField if for_csv_import else DynamicModelChoiceField
field = field_class( kwargs = {
queryset=model.objects.all(), 'queryset': model.objects.all(),
required=required, 'required': required,
initial=initial, 'initial': initial,
query_params=self.related_object_filter }
) if not for_csv_import:
kwargs['query_params'] = self.related_object_filter
field = field_class(**kwargs)
# Multiple objects # Multiple objects
elif self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT: elif self.type == CustomFieldTypeChoices.TYPE_MULTIOBJECT:
model = self.related_object_type.model_class() model = self.related_object_type.model_class()
field_class = CSVModelMultipleChoiceField if for_csv_import else DynamicModelMultipleChoiceField field_class = CSVModelMultipleChoiceField if for_csv_import else DynamicModelMultipleChoiceField
field = field_class( kwargs = {
queryset=model.objects.all(), 'queryset': model.objects.all(),
required=required, 'required': required,
initial=initial, 'initial': initial,
query_params=self.related_object_filter }
) if not for_csv_import:
kwargs['query_params'] = self.related_object_filter
field = field_class(**kwargs)
# Text # Text
else: else: