diff options
| author | Xavier Morel <xmo@odoo.com> | 2020-07-20 07:22:33 +0000 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2020-07-28 13:03:13 +0000 |
| commit | c8063af7a085eda61e470fa5c861e94388429644 (patch) | |
| tree | 4138a64b383e2ee9cc50d5275d85e4fb03c2c568 /odoo/tools | |
| parent | 6835aeb0de6895f7f4d6b23e0b4654465ef21d6a (diff) | |
[IMP] core, account, lunch: make <menuitem> recursive
For clarity, some data files are formatted as pseudo-tree
structure. This is somewhat confusing and dangerous when the structure
has no meaning... so add meaning:
* allow nesting menuitems, nested items are set as children to the
parent they're nested in
* update schema to allow an icon *or* a parent on regular menu items,
and neither on nested (they have an implicit parent meaning can't
have an icon)
* remove attributes which don't actually exist from the menuitem
schema
* also type sequence as an integer while at it
Convert two large-ish menuitem data files to recursive form.
closes odoo/odoo#54564
Related: odoo/enterprise#11887
Signed-off-by: Xavier Morel (xmo) <xmo@odoo.com>
Diffstat (limited to 'odoo/tools')
| -rw-r--r-- | odoo/tools/convert.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/odoo/tools/convert.py b/odoo/tools/convert.py index 0a6a0c23da8..54b9b0d9ef4 100644 --- a/odoo/tools/convert.py +++ b/odoo/tools/convert.py @@ -419,7 +419,7 @@ form: module.record_id""" % (xml_id,) data = dict(xml_id=xid, values=res, noupdate=self.noupdate) self.env['ir.actions.act_window']._load_records([data], self.mode == 'update') - def _tag_menuitem(self, rec): + def _tag_menuitem(self, rec, parent=None): rec_id = rec.attrib["id"] self._test_xml_id(rec_id) @@ -433,11 +433,12 @@ form: module.record_id""" % (xml_id,) if rec.get('sequence'): values['sequence'] = int(rec.get('sequence')) - if rec.get('parent'): + if parent is not None: + values['parent_id'] = parent + elif rec.get('parent'): values['parent_id'] = self.id_get(rec.attrib['parent']) - else: - if rec.get('web_icon'): - values['web_icon'] = rec.attrib['web_icon'] + elif rec.get('web_icon'): + values['web_icon'] = rec.attrib['web_icon'] if rec.get('name'): @@ -475,7 +476,9 @@ form: module.record_id""" % (xml_id,) 'values': values, 'noupdate': self.noupdate, } - self.env['ir.ui.menu']._load_records([data], self.mode == 'update') + menu = self.env['ir.ui.menu']._load_records([data], self.mode == 'update') + for child in rec.iterchildren('menuitem'): + self._tag_menuitem(child, parent=menu.id) def _tag_record(self, rec): rec_model = rec.get("model") |