[MERGE] forward port branch saas-12.4 up to cda4f3c308c

2 files changed, 3 insertions, 3 deletions

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index e910b414551..98824e81839 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -219,8 +219,8 @@ class View(models.Model):
         return most_specific_views
 
     @api.model
-    def _view_get_inherited_children(self, view, options):
-        extensions = super(View, self)._view_get_inherited_children(view, options)
+    def _view_get_inherited_children(self, view):
+        extensions = super(View, self)._view_get_inherited_children(view)
         return extensions.filter_duplicate()
 
     @api.model
diff --git a/addons/website/models/website_redirect.py b/addons/website/models/website_redirect.py
index 511a006b8a7..a0fbda884b0 100644
--- a/addons/website/models/website_redirect.py
+++ b/addons/website/models/website_redirect.py
@@ -13,6 +13,6 @@ class WebsiteRedirect(models.Model):
     redirect_type = fields.Selection([('301', 'Moved permanently (301)'), ('302', 'Moved temporarily (302)')], string='Redirection Type', required=True, default="301")
     url_from = fields.Char('Redirect From', required=True)
     url_to = fields.Char('Redirect To', required=True)
-    website_id = fields.Many2one('website', 'Website')
+    website_id = fields.Many2one('website', 'Website', ondelete='cascade')
     active = fields.Boolean(default=True)
     sequence = fields.Integer()