fixes #2716: Wiki pages should be undeletable

app/views/wiki_pages/_form.html.erb

@@ -18,8 +18,12 @@
 
     <%= dtext_field "wiki_page", "body" %>
 
-    <% if CurrentUser.is_moderator? %>
-      <%= f.input :is_locked %>
+    <% if CurrentUser.is_builder? && @wiki_page.is_deleted? %>
+      <%= f.input :is_deleted, :label => "Deleted", :hint => "Uncheck to restore this wiki page" %>
+    <% end %>
+
+    <% if CurrentUser.is_builder? %>
+      <%= f.input :is_locked, :label => "Locked" %>
     <% end %>
 
     <%= f.button :submit, "Submit", :data => { :disable_with => "Submitting..." } %>

app/views/wiki_pages/_secondary_links.html.erb

@@ -18,7 +18,7 @@
         <% if CurrentUser.is_member? %>
           <li><%= link_to "Edit", edit_wiki_page_path(@wiki_page), :id => "wiki-page-edit-link" %></li>
         <% end %>
-        <% if CurrentUser.is_moderator? %>
+        <% if CurrentUser.is_builder? && !@wiki_page.is_deleted? %>
           <li><%= link_to "Delete", wiki_page_path(@wiki_page), :remote => true, :method => :delete, :data => {:confirm => "Are you sure you want to delete this wiki page?"} %></li>
         <% end %>
       <% end %>

app/views/wiki_pages/search.html.erb

@@ -16,6 +16,11 @@
         <%= select "search", "order", ["Name", "Date"] %>
       </div>
 
+      <div class="input">
+        <label for="search_hide_deleted">Hide Deleted</label>
+        <%= select "search", "hide_deleted", ["Yes", "No"] %>
+      </div>
+
       <%= submit_tag "Search" %>
     <% end %>
   </div>

app/views/wiki_pages/show.html.erb

@@ -10,6 +10,10 @@
         <% if @wiki_page.is_locked? %>
           (locked)
         <% end %>
+
+        <% if @wiki_page.is_deleted? %>
+          (deleted)
+        <% end %>
       </h1>
 
       <div id="wiki-page-body" class="prose">