summaryrefslogtreecommitdiff
path: root/addons/web_editor/models
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2019-07-24 16:06:27 +0000
committerRomain Derie <rde@odoo.com>2019-07-24 16:06:27 +0000
commitbac4b43a233d5b5af7930f8e4eba9078da34d94a (patch)
tree733cce1714150e875d6a406aa1d6d2c6ba371e9b /addons/web_editor/models
parent463bfd5b0519689d22333e1f6b43756e91afac86 (diff)
[FIX] web_editor, website: remove unused param
`_view_get_inherited_children()` `options` parameter is not more useful. Introduced with ae8232136d and not used since edce2fd6d09. Also, the opportunity is taken to rename `options` in `_views_get` into `get_children. Indeed `options` does not mean much. closes odoo/odoo#35157 Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Diffstat (limited to 'addons/web_editor/models')
-rw-r--r--addons/web_editor/models/ir_ui_view.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py
index 44f136dc471..9f856a11a78 100644
--- a/addons/web_editor/models/ir_ui_view.py
+++ b/addons/web_editor/models/ir_ui_view.py
@@ -203,7 +203,7 @@ class IrUiView(models.Model):
self.write({'arch': self._pretty_arch(new_arch)})
@api.model
- def _view_get_inherited_children(self, view, options):
+ def _view_get_inherited_children(self, view):
return view.inherit_children_ids
@api.model
@@ -220,7 +220,7 @@ class IrUiView(models.Model):
# Used by translation mechanism, SEO and optional templates
@api.model
- def _views_get(self, view_id, options=True, bundles=False, root=True):
+ def _views_get(self, view_id, get_children=True, bundles=False, root=True):
""" For a given view ``view_id``, should return:
* the view itself
* all views inheriting from it, enabled or not
@@ -249,17 +249,17 @@ class IrUiView(models.Model):
except ValueError:
continue
if called_view and called_view not in views_to_return:
- views_to_return += self._views_get(called_view, options=options, bundles=bundles)
+ views_to_return += self._views_get(called_view, get_children=get_children, bundles=bundles)
- extensions = self._view_get_inherited_children(view, options)
- if not options:
+ extensions = self._view_get_inherited_children(view)
+ if not get_children:
# only active children
extensions = extensions.filtered(lambda view: view.active)
- # Keep options in a deterministic order regardless of their applicability
+ # Keep children in a deterministic order regardless of their applicability
for extension in extensions.sorted(key=lambda v: v.id):
# only return optional grandchildren if this child is enabled
- for ext_view in self._views_get(extension, options=extension.active, root=False):
+ for ext_view in self._views_get(extension, get_children=extension.active, root=False):
if ext_view not in views_to_return:
views_to_return += ext_view
return views_to_return