Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions base_import_async/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@
"website": "https://github.com/OCA/queue",
"category": "Generic Modules",
"depends": ["base_import", "queue_job"],
"data": ["data/queue_job_function_data.xml", "views/base_import_async.xml"],
"qweb": ["static/src/xml/import.xml"],
"installable": False,
"data": ["data/queue_job_function_data.xml"],
"assets": {
"web.assets_backend": [
"base_import_async/static/src/js/import.js",
],
'web.assets_qweb': [
'base_import_async/static/src/xml/import.xml',
],
},
"installable": True,
"development_status": "Production/Stable",
}
4 changes: 2 additions & 2 deletions base_import_async/models/base_import_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
class BaseImportImport(models.TransientModel):
_inherit = "base_import.import"

def do(self, fields, columns, options, dryrun=False):
def execute_import(self, fields, columns, options, dryrun=False):
if dryrun or not options.get(OPT_USE_QUEUE):
# normal import
return super().do(fields, columns, options, dryrun=dryrun)
return super().execute_import(fields, columns, options, dryrun=dryrun)

# asynchronous import
try:
Expand Down
2 changes: 1 addition & 1 deletion base_import_async/static/src/xml/import.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<templates>
<t t-extend="ImportView">
<t t-extend="ImportView.side_panel">
<t t-jquery="#oe_import_has_header" t-operation="before">
<div
title="When checked, the import will be executed as a background job,
Expand Down