From 9eb4b0a99bd36b0e52fb4cd46ecd881e86799986 Mon Sep 17 00:00:00 2001 From: Laurent Mignon Date: Fri, 17 Mar 2017 14:06:24 +0100 Subject: [PATCH] [FIX] help_online: Add the key attribute into the exported data This key is required to get the pages properly imported as web pages --- help_online/tests/common.py | 1 + help_online/tests/test_export_help_wizard.py | 2 ++ help_online/wizards/export_help_wizard.py | 1 + 3 files changed, 4 insertions(+) diff --git a/help_online/tests/common.py b/help_online/tests/common.py index a2d5e842..4c3545a9 100644 --- a/help_online/tests/common.py +++ b/help_online/tests/common.py @@ -81,6 +81,7 @@ class TestWizardCommon(object): 'type': 'qweb', 'arch': arch, 'page': True, + 'key': 'website.' + pageName } view_id = self.env['ir.ui.view'].create(vals) return view_id.id diff --git a/help_online/tests/test_export_help_wizard.py b/help_online/tests/test_export_help_wizard.py index 933ca3cb..44b4a5c0 100644 --- a/help_online/tests/test_export_help_wizard.py +++ b/help_online/tests/test_export_help_wizard.py @@ -31,6 +31,8 @@ class TestExportHelpWizard(TestWizardCommon): templateNodeList = rootXml.findall(xPath) self.assertEqual(len(templateNodeList), 1) self.assertNotIn("website.", templateNodeList[0].attrib['name']) + self.assertEqual( + "website." + self.pageName, templateNodeList[0].attrib['key']) if self.imgXmlId: xPath = ".//record[@id='%s']" % self.imgXmlId diff --git a/help_online/wizards/export_help_wizard.py b/help_online/wizards/export_help_wizard.py index e7c7da91..71e84568 100644 --- a/help_online/wizards/export_help_wizard.py +++ b/help_online/wizards/export_help_wizard.py @@ -236,6 +236,7 @@ class ExportHelpWizard(models.TransientModel): root.attrib['name'] = ir_ui_view.name.replace('website.', '') root.attrib['id'] = xml_id root.attrib['page'] = 'True' + root.attrib['key'] = ir_ui_view.key self._manage_images_on_page(root, data_node, exported_resources) self._clean_href_urls(root, page_prefix, template_prefix)