Techsystech
/
web
mirror of https://github.com/OCA/web.git
3
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

[FIX] help_online: avoid removal of exported pages 

Always use the '__export__' prefix when generating the xmlid of pages exported by the export wizard to avoid autmomatic removal of these pages by Odoo on system update (-u)
pull/526/head
Laurent Mignon (ACSONE) 2017-03-08 10:58:24 +01:00
parent 1a5b413d43
commit 4f6c1ff671
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
help_online/tests/test_export_help_wizard.py
View File

@ -27,7 +27,7 @@ class TestExportHelpWizard(TestWizardCommon):
parser = ET.XMLParser(remove_blank_text=True) parser = ET.XMLParser(remove_blank_text=True)
rootXml = ET.XML(xmlData, parser=parser) rootXml = ET.XML(xmlData, parser=parser)
xPath = ".//template[@id='website.%s']" % self.pageName xPath = ".//template[@id='__export__.%s']" % self.pageName
templateNodeList = rootXml.findall(xPath) templateNodeList = rootXml.findall(xPath)
self.assertEqual(len(templateNodeList), 1) self.assertEqual(len(templateNodeList), 1)
self.assertNotIn("website.", templateNodeList[0].attrib['name']) self.assertNotIn("website.", templateNodeList[0].attrib['name'])
@ -47,7 +47,7 @@ class TestExportHelpWizard(TestWizardCommon):
self.assertIn("/web/image/%s" % self.imgXmlId, imgSrc) self.assertIn("/web/image/%s" % self.imgXmlId, imgSrc)
if self.pageTemplate: if self.pageTemplate:
xPath = ".//template[@id='website.%s_snippet']" % self.pageName xPath = ".//template[@id='__export__.%s_snippet']" % self.pageName
templateNodeList = rootXml.findall(xPath) templateNodeList = rootXml.findall(xPath)
self.assertEqual(len(templateNodeList), 1) self.assertEqual(len(templateNodeList), 1)
self.assertNotIn("website.", templateNodeList[0].attrib['name']) self.assertNotIn("website.", templateNodeList[0].attrib['name'])

4
help_online/wizards/export_help_wizard.py
View File

@ -271,6 +271,10 @@ class ExportHelpWizard(models.TransientModel):
return data[0].name return data[0].name
else: else:
module, name = template_name.split('.') module, name = template_name.split('.')
# always use __export__ as module by convention to
# avoid the removal by odoo of the exported pages on system
# update (-u )
module = "__export__"
postfix = ir_model_data.search_count( postfix = ir_model_data.search_count(
[('module', '=', module), [('module', '=', module),
('name', 'like', name)]) ('name', 'like', name)])