diff --git a/addons/test_xlsx_export/tests/test_export.py b/addons/test_xlsx_export/tests/test_export.py index c676dca3ca8ad5b42aedfc888a82d501290479fe..4d253b332d6da1e83aab2e1d9b03c0a8f5d33303 100644 --- a/addons/test_xlsx_export/tests/test_export.py +++ b/addons/test_xlsx_export/tests/test_export.py @@ -7,6 +7,7 @@ from unittest.mock import patch from odoo import http from odoo.tests import common, tagged +from odoo.tools import mute_logger from odoo.tools.misc import get_lang from odoo.addons.web.controllers.main import ExportXlsxWriter from odoo.addons.mail.tests.common import mail_new_test_user @@ -393,3 +394,38 @@ class TestGroupedExport(XlsxCreatorCase): [' 86420.864 (1)','86420.86'], ['1' ,'86420.86'], ]) + + @mute_logger('odoo.addons.web.controllers.main') + def test_export_with_deleted_field(self): + model = self.env['ir.model']._get('res.partner') + url = '/web/export/namelist' + header = {"Content-Type": "application/json"} + + custom_field = self.env['ir.model.fields'].create([{ + 'name': 'x_test', + 'ttype': 'char', + 'field_description': 'test field', + 'model_id': model.id, + }]) + + export_template = self.env['ir.exports'].create({ + 'name': custom_field.name, + 'export_fields': [(0, 0, {'name': custom_field.name})], + }) + + data = json.dumps({ + 'params': { + 'model': model.model, + 'export_id': export_template.id, + }, + }) + + export_line_field = self.env['ir.exports.line'].search([('name', '=', export_template.name)]) + + self.url_open(url, data, headers=header).json() + self.assertTrue(export_line_field.exists()) + + custom_field.unlink() + + self.url_open(url, data, headers=header).json() + self.assertFalse(export_line_field.exists()) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index bfeb39ddf62094b9625d6393efc6bf7c1d451a43..93d6e5209e83ef5e2dd689e5124ab33e284ec6eb 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1690,7 +1690,15 @@ class Export(http.Controller): def namelist(self, model, export_id): # TODO: namelist really has no reason to be in Python (although itertools.groupby helps) export = request.env['ir.exports'].browse([export_id]).read()[0] - export_fields_list = request.env['ir.exports.line'].browse(export['export_fields']).read() + exported_fields = request.env['ir.exports.line'].browse(export['export_fields']) + fields = self.fields_get(model) + + for invalid_fields in exported_fields.filtered(lambda f: f.name not in fields): + # ir.exports.line lack a ondelete=cascade foreign key on ir.model.fields + _logger.warning("Field %r not found for saved ir.exports of model %s, deleting", invalid_fields.name, model) + invalid_fields.unlink() + + export_fields_list = exported_fields.read() fields_data = self.fields_info( model, [f['name'] for f in export_fields_list])