Skip to content

Commit

Permalink
Merge pull request #60 from saritasa-nest/dependabot/pip/pip-610a471286
Browse files Browse the repository at this point in the history
Bump the pip group with 10 updates
  • Loading branch information
Eg0ra authored Oct 29, 2024
2 parents 6e02e18 + 28b923b commit 11ca771
Show file tree
Hide file tree
Showing 5 changed files with 100 additions and 86 deletions.
5 changes: 5 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
History
=======

UNRELEASED
----------
* Add support django-import-export >= 4.2
* Removed support for django-import-export < 4.2

0.6.1 (2024-10-04)
----------
* Update requirements version and internal naming
Expand Down
15 changes: 9 additions & 6 deletions import_export_extensions/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ def get_result_class(cls) -> type[Result]:

def export(
self,
queryset: QuerySet = None,
*args,
queryset: QuerySet | None = None,
**kwargs,
) -> tablib.Dataset:
"""Init task state before exporting."""
Expand All @@ -200,14 +199,18 @@ def export(
queryset=queryset,
)
return super().export( # type: ignore
*args,
**kwargs,
queryset=queryset,
**kwargs,
)

def export_resource(self, obj, fields: list[fields.Field] | None = None):
def export_resource(
self,
obj,
selected_fields: list[fields.Field] | None = None,
**kwargs,
):
"""Update task status as we export rows."""
resource = super().export_resource(obj, fields) # type: ignore
resource = super().export_resource(obj, selected_fields, **kwargs) # type: ignore
self.update_task_state(state=TaskState.EXPORTING.name)
return resource

Expand Down
10 changes: 8 additions & 2 deletions import_export_extensions/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ def __init__(
self.extra_fields = extra_fields or []
self.render_empty = render_empty

def render(self, value: typing.Iterable[Model], *args, **kwargs) -> str:
def render(
self,
value: typing.Iterable[Model],
obj=None,
*args,
**kwargs,
) -> str:
"""Return an export representation of a intermediate instances.
For atrists example should be returned something like
Expand Down Expand Up @@ -289,7 +295,7 @@ def __init__(self, filename: str):
def render(
self,
value: Model | None,
*args,
obj=None,
**kwargs,
) -> str | None:
"""Convert DB value to URL to file."""
Expand Down
Loading

0 comments on commit 11ca771

Please sign in to comment.