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