From feb098bf452a6d99a1513218ecd14d786097cade Mon Sep 17 00:00:00 2001 From: Bart Kamphorst Date: Tue, 2 Oct 2018 14:03:26 +0200 Subject: [PATCH 1/2] Implement basic file deletion for /pages view. --- lib/gollum/app.rb | 2 +- lib/gollum/views/pages.rb | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb index 42df9dea..cfe35031 100644 --- a/lib/gollum/app.rb +++ b/lib/gollum/app.rb @@ -222,7 +222,7 @@ module Precious wiki.delete_file(filepath, commit) end - redirect to('/fileview') + redirect to('/pages') end post '/rename/*' do diff --git a/lib/gollum/views/pages.rb b/lib/gollum/views/pages.rb index cf9f8b4e..413c2df8 100644 --- a/lib/gollum/views/pages.rb +++ b/lib/gollum/views/pages.rb @@ -29,6 +29,11 @@ module Precious end end + + def delete_file(url) + %Q(
) + end + def files_folders if has_results folders = {} @@ -38,6 +43,7 @@ module Precious @results.each do |page| page_path = page.path page_path = page_path.sub(/^#{Regexp.escape(@path)}\//, '') unless @path.nil? + if page_path.include?('/') folder = page_path.split('/').first @@ -47,12 +53,12 @@ module Precious folders[folder] = folder_link unless folders.key?(folder) elsif page_path != ".gitkeep" if defined? page.format - page_link = %{
  • #{page.name}
  • } - page_files[page.name] = page_link + url = "#{@base_url}/#{page.escaped_url_path}" else - page_link = %{
  • #{page.name}
  • } - page_files[page.name] = page_link + url = "#{@base_url}/#{page.escaped_url_path}#{page.name}" end + page_link = %{
  • #{page.name}#{delete_file(url) if @allow_editing}
  • } + page_files[page.name] = page_link end end From fd9156821ce2b3d89f4ea256413116553bd118d1 Mon Sep 17 00:00:00 2001 From: Bart Kamphorst Date: Tue, 2 Oct 2018 14:21:00 +0200 Subject: [PATCH 2/2] Resolve minor issue to fix tests. --- lib/gollum/views/pages.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/gollum/views/pages.rb b/lib/gollum/views/pages.rb index 413c2df8..465d4487 100644 --- a/lib/gollum/views/pages.rb +++ b/lib/gollum/views/pages.rb @@ -57,7 +57,7 @@ module Precious else url = "#{@base_url}/#{page.escaped_url_path}#{page.name}" end - page_link = %{
  • #{page.name}#{delete_file(url) if @allow_editing}
  • } + page_link = %{
  • #{page.name}#{delete_file(url) if @allow_editing}
  • } page_files[page.name] = page_link end end