Repository: allura Updated Branches: refs/heads/master d5b26edea -> 59719404a
Minor fixups for nbhd home page from wiki content Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/59719404 Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/59719404 Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/59719404 Branch: refs/heads/master Commit: 59719404a72dcd9a5e0b6b58c99a49725850e9fc Parents: e9bedee Author: Kenton Taylor <[email protected]> Authored: Mon Dec 12 19:19:03 2016 +0000 Committer: Dave Brondsema <[email protected]> Committed: Mon Dec 12 15:56:38 2016 -0500 ---------------------------------------------------------------------- Allura/allura/controllers/project.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/59719404/Allura/allura/controllers/project.py ---------------------------------------------------------------------- diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py index 05ef643..685519c 100644 --- a/Allura/allura/controllers/project.py +++ b/Allura/allura/controllers/project.py @@ -98,7 +98,7 @@ class NeighborhoodController(object): if self.neighborhood.use_wiki_page_as_root: default_wiki_page = get_default_wiki_page() if default_wiki_page: - text = g.markdown_wiki.convert('[[include ref=Home]]') + text = default_wiki_page.html_text elif self.neighborhood.redirect: redirect(self.neighborhood.redirect) elif not self.neighborhood.has_home_tool: @@ -1031,6 +1031,5 @@ def get_default_wiki_page(): wiki_page = None wiki_app = c.project.app_instance('wiki') if wiki_app: - wiki_app.config._id wiki_page = WM.Page.query.get(app_config_id=wiki_app.config._id, title='Home') return wiki_page
