bss/incorporeal-cms
1
0
Fork 0
Code Issues 5 Pull Requests Releases 49 Wiki Activity

display untitled-page paths as /path rather than path.md

Browse Source
This commit is contained in:
Brian S. Stephan 2020-05-28 12:17:27 -05:00
parent 059108c37b
commit 05f879ab80
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
incorporealcms/pages.py
View File

@ -66,5 +66,5 @@ def generate_parent_navs(path):
with app.open_instance_resource(resolved_path, 'r') as entry_file: with app.open_instance_resource(resolved_path, 'r') as entry_file:
entry = entry_file.read() entry = entry_file.read()
_ = Markup(md.convert(entry)) _ = 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)] return generate_parent_navs(parent_path) + [(page_name, path)]

6
tests/test_pages.py
View File

@ -58,12 +58,12 @@ def test_generate_page_navs_alternate_index(app):
def test_generate_page_navs_subdir_index(app): def test_generate_page_navs_subdir_index(app):
with app.app_context(): 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): def test_generate_page_navs_subdir_real_page(app):
with app.app_context(): 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')] ('Page', '/subdir/page')]
@ -71,4 +71,4 @@ def test_generate_page_navs_subdir_with_title_parsing_real_page(app):
with app.app_context(): with app.app_context():
assert generate_parent_navs('/subdir-with-title/page') == [('incorporeal.org', '/'), assert generate_parent_navs('/subdir-with-title/page') == [('incorporeal.org', '/'),
('SUB!', '/subdir-with-title/'), ('SUB!', '/subdir-with-title/'),
('page.md', '/subdir-with-title/page')] ('/subdir-with-title/page', '/subdir-with-title/page')]