diff --git a/HISTORY.rst b/HISTORY.rst index df6ceda..9e1a3a0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -2,6 +2,11 @@ History ======= +Unreleased +------------------ + +* Make querysets more consistent for ViewSets + 1.4.0 (2025-01-28) ------------------ diff --git a/import_export_extensions/api/views/export_job.py b/import_export_extensions/api/views/export_job.py index 9e1aafa..ea353af 100644 --- a/import_export_extensions/api/views/export_job.py +++ b/import_export_extensions/api/views/export_job.py @@ -100,6 +100,9 @@ class ExportJobViewSet( def get_queryset(self): """Filter export jobs by resource used in viewset.""" + if self.action == getattr(self, "export_action", ""): + # To make it consistent and for better support of drf-spectacular + return super().get_queryset() # pragma: no cover return super().get_queryset().filter( resource_path=self.resource_class.class_path, ) diff --git a/import_export_extensions/api/views/import_job.py b/import_export_extensions/api/views/import_job.py index d10b0d3..11d0707 100644 --- a/import_export_extensions/api/views/import_job.py +++ b/import_export_extensions/api/views/import_job.py @@ -127,6 +127,9 @@ class ImportJobViewSet( def get_queryset(self): """Filter import jobs by resource used in viewset.""" + if self.action == getattr(self, "import_action", ""): + # To make it consistent and for better support of drf-spectacular + return super().get_queryset() # pragma: no cover return super().get_queryset().filter( resource_path=self.resource_class.class_path, )