diff --git a/lib/gollum/templates/overview.mustache b/lib/gollum/templates/overview.mustache
index 9b412880..dd73b940 100644
--- a/lib/gollum/templates/overview.mustache
+++ b/lib/gollum/templates/overview.mustache
@@ -18,7 +18,7 @@
{{{icon}}}
{{name}}
{{#allow_editing}}
- {{#is_file}}{{/is_file}}
+ {{#is_file}}{{/is_file}}
{{/allow_editing}}
{{/files_folders}}
diff --git a/lib/gollum/views/overview.rb b/lib/gollum/views/overview.rb
index 277ccfd7..87c8ced4 100644
--- a/lib/gollum/views/overview.rb
+++ b/lib/gollum/views/overview.rb
@@ -4,6 +4,7 @@ module Precious
module Views
class Overview < Layout
attr_reader :results, :ref, :allow_editing, :newable
+ HIDDEN_PATHS = ['.gitkeep']
def title
"Overview of #{@ref}"
@@ -51,9 +52,9 @@ module Precious
folder_path = @path ? "#{@path}/#{folder_name}" : folder_name
folder_url = "#{overview_path}/#{folder_path}/"
files_and_folders << {name: folder_name, icon: rocticon('file-directory'), type: 'dir', url: folder_url, is_file: false}
- elsif result_path != '.gitkeep'
+ elsif !HIDDEN_PATHS.include?(result_path)
file_url = page_route(result.escaped_url_path)
- files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, is_file: true}
+ files_and_folders << {name: result.filename, icon: rocticon('file'), type: 'file', url: file_url, file_path: result.escaped_url_path, is_file: true}
end
end
# 1012: Overview should list folders first, followed by files and pages sorted alphabetically
diff --git a/test/test_overview_view.rb b/test/test_overview_view.rb
index 3cc1425e..a0956fef 100644
--- a/test/test_overview_view.rb
+++ b/test/test_overview_view.rb
@@ -86,5 +86,7 @@ context "Precious::Views::Overview" do
results = [FakePageResult.new("Mordor/Eye-Of-Sauron.md"), FakeFileResult.new("Mordor/Aragorn.pdf"), FakePageResult.new("Mordor/Orc/Saruman.md"), FakePageResult.new("Mordor/.gitkeep")]
@page.instance_variable_set("@results", results)
assert_equal @page.files_folders.first[:url], '/wiki/gollum/overview/Mordor/Orc/'
+ assert_equal @page.files_folders.last[:url], '/wiki/Mordor/Eye-Of-Sauron'
+ assert_equal @page.files_folders.last[:file_path], 'Mordor/Eye-Of-Sauron'
end
end