From 8ad9c089f279659182ca0bb393f5be07ef4cfd3b Mon Sep 17 00:00:00 2001
From: Daniil Digtyar Vasilieva <daniildigtyar@gmail.com>
Date: Wed, 5 Jul 2023 10:20:42 +0200
Subject: [PATCH] [IMP] use method to call download of template
---
energy_selfconsumption/data/ir_attactment_data.xml | 6 ------
.../wizards/distribution_table_import_wizard.py | 6 ++----
.../wizards/distribution_table_import_wizard_views.xml | 5 ++++-
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/energy_selfconsumption/data/ir_attactment_data.xml b/energy_selfconsumption/data/ir_attactment_data.xml
index 1747febba..e162bea8d 100644
--- a/energy_selfconsumption/data/ir_attactment_data.xml
+++ b/energy_selfconsumption/data/ir_attactment_data.xml
@@ -9,11 +9,5 @@
</field>
<field name="company_id"></field>
</record>
-
- <record model="ir.actions.act_url" id="distribution_table_download_act_url">
- <field name="name">distribution_table_download_act_url</field>
- <field name="url" eval="'/web/content/' + str(ref('distribution_table_example_attachment')) + '?download=true'"></field>
- <field name="target">new</field>
- </record>
</data>
</odoo>
diff --git a/energy_selfconsumption/wizards/distribution_table_import_wizard.py b/energy_selfconsumption/wizards/distribution_table_import_wizard.py
index bf48b7263..1ee182dd9 100644
--- a/energy_selfconsumption/wizards/distribution_table_import_wizard.py
+++ b/energy_selfconsumption/wizards/distribution_table_import_wizard.py
@@ -35,12 +35,10 @@ class DistributionTableImportWizard(models.TransientModel):
def download_template_button(self):
distribution_table_example_attachment = self.env.ref('energy_selfconsumption.distribution_table_example_attachment')
- base_url = self.env['ir.config_parameter'].get_param('web.base.url')
- download_url = '/web/content/' + str(distribution_table_example_attachment.id) + '?download=true'
- # download
+ download_url = '/web/content/{}/?download=true'.format(str(distribution_table_example_attachment.id))
return {
"type": "ir.actions.act_url",
- "url": str(base_url) + str(download_url),
+ "url": download_url,
"target": "new",
}
diff --git a/energy_selfconsumption/wizards/distribution_table_import_wizard_views.xml b/energy_selfconsumption/wizards/distribution_table_import_wizard_views.xml
index 78bf48a4d..f9a6123f8 100644
--- a/energy_selfconsumption/wizards/distribution_table_import_wizard_views.xml
+++ b/energy_selfconsumption/wizards/distribution_table_import_wizard_views.xml
@@ -8,7 +8,10 @@
<field name="arch" type="xml">
<form>
<sheet>
- <button type="action" name="energy_selfconsumption.distribution_table_download_act_url">Download Template</button>
+ <p>You can download an example template for the import. The template must have this format and
+ be a CSV file.</p>
+ <button type="object" name="download_template_button">Download Template</button>
+ <separator/>
<group>
<field name="import_file" filename="fname" widget="binary"></field>
<field name="fname" invisible="1"></field>
--
GitLab