[MERGE] forward port branch 12.0 up to bc744a1da46

1 files changed, 16 insertions, 1 deletions

diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
index 1820f2f0d8f..e30f824693d 100644
--- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
+++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
@@ -67,8 +67,23 @@ sAnimation.registry.newsletter_popup = sAnimation.Class.extend({
     selector: ".o_newsletter_popup",
     start: function () {
         var self = this;
+
+        // Compatibility: rebuilding a correct modal from user database
+        // content. Since the first version, the modal is saved in databases
+        // directly but has never used a correct structure. While it was working
+        // with BS3, it is not with BS4.
+        // TODO review the newsletter popup creation, save and loading.
+        var $modal = this.$('.modal');
+        if ($modal.is('.modal-dialog')) {
+            $modal.removeClass('modal-md modal-dialog');
+            var $modalContent = $modal.find('.modal-content');
+            $modalContent.wrapAll($('<div/>', {class: 'modal-dialog'}));
+        }
+
         var popupcontent = self.$target.find(".o_popup_content_dev").empty();
-        if (!self.$target.data('list-id')) return;
+        if (!self.$target.data('list-id')) {
+            return;
+        }
 
         this._rpc({
             route: '/website_mass_mailing/get_content',