[MERGE] forward port of branch 8.0 up to a939a27

2 files changed, 11 insertions, 0 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 21dfc9c61d3..12dceabac8f 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1425,6 +1425,12 @@ define(['summernote/summernote'], function () {
         close: function () {
             this.$el.modal('hide');
         },
+        destroy: function () {
+            this.$el.modal('hide').remove();
+            if($(".modal.in").length>0){
+                $('body').addClass('modal-open');
+            }
+        },
     });
 
     website.editor.LinkDialog = website.editor.Dialog.extend({
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index a4fc30890a7..3869986e48a 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -395,5 +395,10 @@
         $('[data-target="#oe_applications"]').attr("data-target", "#oe_applications_collapse");
     });
 
+    openerp.Tour.autoRunning = false;
+    website.ready().then(function () {
+        setTimeout(openerp.Tour.running,0);
+    });
+
     return website;
 })();