From 05f879ab80335956381254b5fade76a9ea98054d Mon Sep 17 00:00:00 2001 From: "Brian S. Stephan" Date: Thu, 28 May 2020 12:17:27 -0500 Subject: [PATCH] display untitled-page paths as /path rather than path.md --- incorporealcms/pages.py | 2 +- tests/test_pages.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/incorporealcms/pages.py b/incorporealcms/pages.py index d64c610..198de15 100644 --- a/incorporealcms/pages.py +++ b/incorporealcms/pages.py @@ -66,5 +66,5 @@ def generate_parent_navs(path): with app.open_instance_resource(resolved_path, 'r') as entry_file: entry = entry_file.read() _ = Markup(md.convert(entry)) - page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else os.path.basename(resolved_path) + page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else path return generate_parent_navs(parent_path) + [(page_name, path)] diff --git a/tests/test_pages.py b/tests/test_pages.py index 71c126d..6da375b 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -58,12 +58,12 @@ def test_generate_page_navs_alternate_index(app): def test_generate_page_navs_subdir_index(app): with app.app_context(): - assert generate_parent_navs('/subdir/') == [('incorporeal.org', '/'), ('index.md', '/subdir/')] + assert generate_parent_navs('/subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')] def test_generate_page_navs_subdir_real_page(app): with app.app_context(): - assert generate_parent_navs('/subdir/page') == [('incorporeal.org', '/'), ('index.md', '/subdir/'), + assert generate_parent_navs('/subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'), ('Page', '/subdir/page')] @@ -71,4 +71,4 @@ def test_generate_page_navs_subdir_with_title_parsing_real_page(app): with app.app_context(): assert generate_parent_navs('/subdir-with-title/page') == [('incorporeal.org', '/'), ('SUB!', '/subdir-with-title/'), - ('page.md', '/subdir-with-title/page')] + ('/subdir-with-title/page', '/subdir-with-title/page')]