From a92c24f093a494a65f131bfdb7098b6df7b3d861 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 6 Nov 2019 15:08:59 -0600
Subject: [PATCH] wiki pages: add undelete link in navbar.

Also redirect back to the wiki page after deleting or undeleting it,
rather than redirecting to the index.
---
 app/views/wiki_pages/_secondary_links.html.erb | 6 ++++--
 app/views/wiki_pages/destroy.js.erb            | 1 -
 app/views/wiki_pages/update.js.erb             | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 app/views/wiki_pages/destroy.js.erb
 create mode 100644 app/views/wiki_pages/update.js.erb

diff --git a/app/views/wiki_pages/_secondary_links.html.erb b/app/views/wiki_pages/_secondary_links.html.erb
index f2e4aabca..bbc900785 100644
--- a/app/views/wiki_pages/_secondary_links.html.erb
+++ b/app/views/wiki_pages/_secondary_links.html.erb
@@ -16,8 +16,10 @@
     <% if CurrentUser.is_member? %>
       <%= subnav_link_to "Edit", edit_wiki_page_path(@wiki_page.id), "data-shortcut": "e" %>
     <% end %>
-    <% if CurrentUser.is_builder? && !@wiki_page.is_deleted? %>
-      <%= subnav_link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :"data-shortcut" => "shift+d", :"data-confirm" => "Are you sure you want to delete this wiki page?" %>
+    <% if CurrentUser.is_builder? && @wiki_page.is_deleted? %>
+      <%= subnav_link_to "Undelete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=false", "data-shortcut": "shift+d" %>
+    <% elsif CurrentUser.is_builder? && !@wiki_page.is_deleted? %>
+      <%= subnav_link_to "Delete", wiki_page_path(@wiki_page.id), remote: true, method: :put, "data-params": "wiki_page[is_deleted]=true", "data-shortcut": "shift+d" %>
     <% end %>
   <% elsif @wiki_page_version %>
     <li>|</li>
diff --git a/app/views/wiki_pages/destroy.js.erb b/app/views/wiki_pages/destroy.js.erb
deleted file mode 100644
index 4b2e753f2..000000000
--- a/app/views/wiki_pages/destroy.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-window.location.href = "/wiki_pages";
diff --git a/app/views/wiki_pages/update.js.erb b/app/views/wiki_pages/update.js.erb
new file mode 100644
index 000000000..345366b9b
--- /dev/null
+++ b/app/views/wiki_pages/update.js.erb
@@ -0,0 +1 @@
+location.reload();