summaryrefslogtreecommitdiff
path: root/odoo/tools/template_inheritance.py
diff options
context:
space:
mode:
authorAlexandre Kühn <aku@odoo.com>2019-08-28 15:05:28 +0000
committerAlexandre Kühn <aku@odoo.com>2019-08-30 11:41:12 +0000
commitdc31884dcf0a6722a191644ed7caf0d68ec96ffa (patch)
tree3030f68afd2a376883cf1c691a93c5845a1fac58 /odoo/tools/template_inheritance.py
parentec9b365b184c0b6a51e84c6238b00ad32e296ef7 (diff)
[FIX] base, tools: add `pre_locate` to `apply_inheritance_specs`
Revision on https://github.com/odoo/odoo/commit/fc5878ecc668ee83cd1a374474f0b21bf6a51940 Commit above introduced server-side inheritance of static XML. To do so, it made some changes to the way inheritance of view templates is applied, such as moving this logic outside of the record `ir.ui.view`. This change, however, removed the feature to overwrite these methods. Studio did that in order to correctly apply `group_ids`[1][2]. This commit fixes the issue by introducing an optional callback `pre_locate` as parameter of the methods `apply_inheritance_specs`. When set, this function is called just before locating a node during the application of inheritance of the view. Studio can make use of this callback to handle group_ids properly, again. [1] https://github.com/odoo/enterprise/commit/b56101200ac35dae3eadbc0bdf4ba17461f33907 [2] https://github.com/odoo/enterprise/commit/38f7eb8153df8406498fa58eb809271db778e6d8 Related to: https://github.com/odoo/enterprise/pull/5321 Task-Id 2047439 closes odoo/odoo#36200 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'odoo/tools/template_inheritance.py')
-rw-r--r--odoo/tools/template_inheritance.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/odoo/tools/template_inheritance.py b/odoo/tools/template_inheritance.py
index 347e022d87b..7f84f97d225 100644
--- a/odoo/tools/template_inheritance.py
+++ b/odoo/tools/template_inheritance.py
@@ -74,7 +74,7 @@ def locate_node(arch, spec):
return None
-def apply_inheritance_specs(source, specs_tree, inherit_branding=False):
+def apply_inheritance_specs(source, specs_tree, inherit_branding=False, pre_locate=lambda s: True):
""" Apply an inheriting view (a descendant of the base view)
Apply to a source architecture all the spec nodes (i.e. nodes
@@ -82,6 +82,9 @@ def apply_inheritance_specs(source, specs_tree, inherit_branding=False):
architecture) given by an inheriting view.
:param Element source: a parent architecture to modify
+ :param pre_locate: function that is executed before locating a node.
+ This function receives an arch as argument.
+ This is required by studio to properly handle group_ids.
:return: a modified source where the specs are applied
:rtype: Element
"""
@@ -99,6 +102,7 @@ def apply_inheritance_specs(source, specs_tree, inherit_branding=False):
_("Invalid specification for moved nodes: '%s'") %
etree.tostring(spec)
)
+ pre_locate(spec)
to_extract = locate_node(source, spec)
if to_extract is not None:
remove_element(to_extract)
@@ -116,6 +120,7 @@ def apply_inheritance_specs(source, specs_tree, inherit_branding=False):
if spec.tag == 'data':
specs += [c for c in spec]
continue
+ pre_locate(spec)
node = locate_node(source, spec)
if node is not None:
pos = spec.get('position', 'inside')