Update method reference in get_actions (#1681)

* Update method reference in get_actions The method reference in get_actions within import_export/admin.py was updated from using ExportActionMixin.export_admin_action to type(self).export_admin_action. This change ensures that the function call always refers to the current instance's class method. This is particularly important in situations where the class has been inherited and the method overridden. * Added test for the `export_admin_action` override, fixing issue #1680. * Added test for the `export_admin_action` override, fixing issue #1680. * reformatting for black, fixing issue #1680. * reformatting for black, fixing issue #1680. * reformatting for black, fixing issue #1680. --------- Co-authored-by: Willem Van Onsem <willem.vanonsem@prosafco.be>
django-import-export · Nov 11, 2023 · d81869d · d81869d
1 parent 6319211
commit d81869d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,7 +4,7 @@ Changelog
 3.3.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- `.export_admin_action` can be overridden by subclassing it in the `ModelAdmin`.
 
 
 3.3.2 (2023-11-09)

diff --git a/import_export/admin.py b/import_export/admin.py
@@ -918,7 +918,7 @@ def get_actions(self, request):
         actions = super().get_actions(request)
         actions.update(
             export_admin_action=(
-                ExportActionMixin.export_admin_action,
+                type(self).export_admin_action,
                 "export_admin_action",
                 _("Export selected %(verbose_name_plural)s"),
             )

diff --git a/tests/core/admin.py b/tests/core/admin.py
@@ -38,7 +38,8 @@ class BookAdmin(ImportExportModelAdmin):
 
 
 class CategoryAdmin(ExportActionModelAdmin):
-    pass
+    def export_admin_action(self, request, queryset):
+        return super().export_admin_action(request, queryset)
 
 
 class AuthorAdmin(ImportMixin, admin.ModelAdmin):

diff --git a/tests/core/tests/test_admin_integration.py b/tests/core/tests/test_admin_integration.py
@@ -33,6 +33,7 @@
 
 
 class AdminTestMixin(object):
+    category_change_url = "/admin/core/category/"
     book_import_url = "/admin/core/book/import/"
     book_process_import_url = "/admin/core/book/process_import/"
     legacybook_import_url = "/admin/core/legacybook/import/"
@@ -256,6 +257,22 @@ def test_import_legacy_book(self):
             response, "Import finished, with 0 new and 1 updated legacy books."
         )
 
+    def test_export_admin_action(self):
+        with mock.patch(
+            "core.admin.CategoryAdmin.export_admin_action"
+        ) as mock_export_admin_action:
+            response = self.client.post(
+                self.category_change_url,
+                {
+                    "action": "export_admin_action",
+                    "index": "0",
+                    "selected_across": "0",
+                    "_selected_action": "0",
+                },
+            )
+            assert 200 <= response.status_code <= 399
+            mock_export_admin_action.assert_called()
+
     def test_import_action_handles_UnicodeDecodeError_as_form_error(self):
         with mock.patch(
             "import_export.admin.TempFolderStorage.read"