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 %>
  • |
  • 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();