diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-11-02 10:52:55 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-11-02 10:52:55 +0100 |
| commit | 5e055a2afd23bd4e6a29c18c86d1978dcd98fc9f (patch) | |
| tree | 058c2cef359de70f7bbabacaa63446fa189af12e /addons/website | |
| parent | 486777654009aa372a21e9d6dd52e8c22173ee16 (diff) | |
| parent | f6ca72b3ce9ecc9007ae5825d2c648e3b26b098e (diff) | |
[MERGE] forward port branch saas-11.4 up to f6ca72b3ce9
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/models/website.py | 5 | ||||
| -rw-r--r-- | addons/website/static/src/js/editor/snippets.options.js | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/addons/website/models/website.py b/addons/website/models/website.py index cec3ceeb246..c592ad32b57 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -111,6 +111,11 @@ class Website(models.Model): ('b2c', 'Free sign up'), ], string='Customer Account', default='b2b') + @api.onchange('language_ids') + def _onchange_language_ids(self): + if self.language_ids and self.default_lang_id not in self.language_ids: + self.default_lang_id = self.language_ids[0] + @api.multi def _compute_menu(self): Menu = self.env['website.menu'] diff --git a/addons/website/static/src/js/editor/snippets.options.js b/addons/website/static/src/js/editor/snippets.options.js index f50b653ab2e..3d79951cf70 100644 --- a/addons/website/static/src/js/editor/snippets.options.js +++ b/addons/website/static/src/js/editor/snippets.options.js @@ -271,6 +271,7 @@ options.registry.carousel = options.Class.extend({ * @override */ _setActive: function () { + this._super.apply(this, arguments); this.$el.find('[data-interval]').removeClass('active') .filter('[data-interval=' + this.$target.attr('data-interval') + ']').addClass('active'); }, |