diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-03-26 11:13:43 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-03-26 11:13:43 +0300 |
| commit | 44e4fd0b1cc85b9a03f871d651f00680749a6c60 (patch) | |
| tree | 2ea9e5241ec805708842fd3ddcb70cfeef6a4bcd /app/controllers/projects/wikis_controller.rb | |
| parent | 92de278a15717258df75d2ef7b1d57f5122f20a9 (diff) | |
Avoid loading default sidebar if there's a customized one
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index f7aa0ed44e8..cfb7d6fd941 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -106,9 +106,12 @@ class Projects::WikisController < Projects::ApplicationController # Call #wiki to make sure the Wiki Repo is initialized @project_wiki.wiki - @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages(limit: 15)) - # Optional _sidebar.md page + @sidebar_page = @project_wiki.find_page('_sidebar', params[:version_id]) + + unless @sidebar_page # Fallback to default sidebar + @sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages(limit: 15)) + end rescue ProjectWiki::CouldNotCreateWikiError flash[:notice] = "Could not create Wiki Repository at this time. Please try again later." redirect_to project_path(@project) |