wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Don't add base path to file url for deletion. Resolves https://github.com/gollum/gollum/pull/1620 (#1639)

Browse Source 
* Add regression test
This commit is contained in:
Dawa Ometto
2021-01-04 11:29:45 +01:00
committed by GitHub
parent 6c0796733d
commit 18a16665cc
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/templates/overview.mustache
+1 -1
View File
@@ -18,7 +18,7 @@
<span class="pr-2">{{{icon}}}</span> <span class="pr-2">{{{icon}}}</span>
<span><a href="{{url}}">{{name}}</a></span> <span><a href="{{url}}">{{name}}</a></span>
{{#allow_editing}} {{#allow_editing}}
{{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path="{{url}}" data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trashcan{{/octicon}}</button>{{/is_file}} {{#is_file}}<button class="btn btn-sm float-right delete-file" data-file-path="{{file_path}}" data-confirm="Are you sure you want to delete {{name}}?">{{#octicon}}trashcan{{/octicon}}</button>{{/is_file}}
{{/allow_editing}} {{/allow_editing}}
</li> </li>
{{/files_folders}} {{/files_folders}}
lib/gollum/views/overview.rb
+3 -2
View File
@@ -4,6 +4,7 @@ module Precious
module Views module Views
class Overview < Layout class Overview < Layout
attr_reader :results, :ref, :allow_editing, :newable attr_reader :results, :ref, :allow_editing, :newable
HIDDEN_PATHS = ['.gitkeep']
def title def title
"Overview of #{@ref}" "Overview of #{@ref}"
@@ -51,9 +52,9 @@ module Precious
folder_path = @path ? "#{@path}/#{folder_name}" : folder_name folder_path = @path ? "#{@path}/#{folder_name}" : folder_name
folder_url = "#{overview_path}/#{folder_path}/" folder_url = "#{overview_path}/#{folder_path}/"
files_and_folders << {name: folder_name, icon: rocticon('file-directory'), type: 'dir', url: folder_url, is_file: false} 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) 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
end end
# 1012: Overview should list folders first, followed by files and pages sorted alphabetically # 1012: Overview should list folders first, followed by files and pages sorted alphabetically
test/test_overview_view.rb
+2
View File
@@ -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")] 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) @page.instance_variable_set("@results", results)
assert_equal @page.files_folders.first[:url], '/wiki/gollum/overview/Mordor/Orc/' 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
end end