From f7cb30b6d820c69b9cfb8c5c62cca8f33c2742ef Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 5 Nov 2019 15:02:06 +0100 Subject: [PATCH] [FIX] _extension: complete monkeypatch in sphinx 1.6 The monkey patch made for sphinx 1.6 was not complete. In comparison to the one done for previous versions (resolve_toctree), navbarify was not called. In the toctree, the sub-levels were turned into a link in 1.6 while navbarify prevents this. --- _extensions/odoo/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_extensions/odoo/__init__.py b/_extensions/odoo/__init__.py index e4191e900..65d6a05ba 100644 --- a/_extensions/odoo/__init__.py +++ b/_extensions/odoo/__init__.py @@ -111,7 +111,13 @@ if toctree: def resolve(old_resolve, tree, docname, *args, **kwargs): if docname == tree.env.config.master_doc: return resolve_content_toctree(tree.env, docname, *args, **kwargs) - return old_resolve(tree, docname, *args, **kwargs) + toc = old_resolve(tree, docname, *args, **kwargs) + if toc is None: + return None + + navbarify(toc[0], navbar=kwargs.pop('navbar', None)) + return toc + @monkey(sphinx.environment.BuildEnvironment) def resolve_toctree(old_resolve, self, docname, *args, **kwargs):