Skip to content

Commit

Permalink
Improve import naming
Browse files Browse the repository at this point in the history
  • Loading branch information
Eg0ra committed Nov 2, 2024
1 parent 1edff43 commit 9530b0a
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 17 deletions.
6 changes: 4 additions & 2 deletions import_export_extensions/admin/mixins/base_mixin.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import typing

from import_export import admin as base_admin
from import_export import admin as import_export_admin

from . import types


class BaseCeleryImportExportAdminMixin(base_admin.ImportExportMixinBase):
class BaseCeleryImportExportAdminMixin(
import_export_admin.ImportExportMixinBase,
):
"""Base mixin for import/export admin mixins."""

@property
Expand Down
14 changes: 8 additions & 6 deletions import_export_extensions/admin/mixins/export_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
from django.urls import re_path, reverse
from django.utils.translation import gettext_lazy as _

from import_export import admin as base_admin
from import_export import forms as base_forms
from import_export import mixins as base_mixins
from import_export import admin as import_export_admin
from import_export import forms as import_export_forms
from import_export import mixins as import_export_mixins

from ... import models
from . import base_mixin, types


class CeleryExportAdminMixin(
base_mixins.BaseExportMixin,
import_export_mixins.BaseExportMixin,
base_mixin.BaseCeleryImportExportAdminMixin,
):
"""Admin mixin for celery export.
Expand Down Expand Up @@ -62,7 +62,9 @@ class CeleryExportAdminMixin(
export_results_statuses = models.ExportJob.export_finished_statuses

# Copy methods of mixin from original package to reuse it here
has_export_permission = base_admin.ExportMixin.has_export_permission
has_export_permission = (
import_export_admin.ExportMixin.has_export_permission
)

def get_export_context_data(self, **kwargs):
"""Get context data for export."""
Expand Down Expand Up @@ -118,7 +120,7 @@ def celery_export_action(self, request, *args, **kwargs):
raise PermissionDenied

formats = self.get_export_formats()
form = base_forms.ExportForm(
form = import_export_forms.ExportForm(
formats=formats,
resources=self.get_export_resource_classes(request),
data=request.POST or None,
Expand Down
20 changes: 11 additions & 9 deletions import_export_extensions/admin/mixins/import_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
from django.urls import re_path, reverse
from django.utils.translation import gettext_lazy as _

from import_export import admin as base_admin
from import_export import mixins as base_mixins
from import_export import admin as import_export_admin
from import_export import mixins as import_export_mixins

from ... import models
from ..forms import ForceImportForm
from . import base_mixin, types


class CeleryImportAdminMixin(
base_mixins.BaseImportMixin,
import_export_mixins.BaseImportMixin,
base_mixin.BaseCeleryImportExportAdminMixin,
):
"""Admin mixin for celery import.
Expand Down Expand Up @@ -74,12 +74,14 @@ class CeleryImportAdminMixin(

skip_admin_log = None
# Copy methods of mixin from original package to reuse it here
generate_log_entries = base_admin.ImportMixin.generate_log_entries
get_skip_admin_log = base_admin.ImportMixin.get_skip_admin_log
has_import_permission = base_admin.ImportMixin.has_import_permission
_log_actions = base_admin.ImportMixin._log_actions
_create_log_entries = base_admin.ImportMixin._create_log_entries
_create_log_entry = base_admin.ImportMixin._create_log_entry
generate_log_entries = import_export_admin.ImportMixin.generate_log_entries
get_skip_admin_log = import_export_admin.ImportMixin.get_skip_admin_log
has_import_permission = (
import_export_admin.ImportMixin.has_import_permission
)
_log_actions = import_export_admin.ImportMixin._log_actions
_create_log_entries = import_export_admin.ImportMixin._create_log_entries
_create_log_entry = import_export_admin.ImportMixin._create_log_entry

def get_import_context_data(self, **kwargs):
"""Get context data for import."""
Expand Down

0 comments on commit 9530b0a

Please sign in to comment.