[MERGE] forward port branch 12.0 up to e11bacfe512

1 files changed, 7 insertions, 1 deletions

diff --git a/doc/_extensions/odoo_ext/__init__.py b/doc/_extensions/odoo_ext/__init__.py
index 3cca5f7c435..16b4a5326f7 100644
--- a/doc/_extensions/odoo_ext/__init__.py
+++ b/doc/_extensions/odoo_ext/__init__.py
@@ -21,6 +21,10 @@ def setup(app):
                      location="odoo extension")
         app.config.html_translator_class = 'odoo_ext.translator.BootstrapTranslator'
 
+    add_js_file = getattr(app, 'add_js_file', None) or app.add_javascript
+    for f in ['jquery.min.js', 'bootstrap.js', 'doc.js', 'jquery.noconflict.js']:
+        add_js_file(f)
+
     switcher.setup(app)
     app.add_config_value('odoo_cover_default', None, 'env')
     app.add_config_value('odoo_cover_external', {}, 'env')
@@ -28,7 +32,9 @@ def setup(app):
     app.connect('html-page-context', update_meta)
 
 def update_meta(app, pagename, templatename, context, doctree):
-    meta = context.setdefault('meta', {})
+    meta = context.get('meta')
+    if meta is None:
+        meta = context['meta'] = {}
     meta.setdefault('banner', app.config.odoo_cover_default)
 
 def navbarify(node, navbar=None):