1 files changed, 8 insertions, 2 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 9ea66ad..021f8ff 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -144,7 +144,7 @@ class NodesController < ApplicationController
  def trash
     if @node.trash!(current_user)
       flash[:notice] = "Page has been moved to the Trash"
-      redirect_to node_path(Node.trash)
+      redirect_to trashed_nodes_path
     else
       flash[:notice] = "Page is already in the Trash"
       redirect_to node_path(@node)
@@ -170,7 +170,8 @@ class NodesController < ApplicationController
   def destroy
     @node.destroy_from_trash!(current_user)
     flash[:notice] = "Page has been permanently deleted"
-    redirect_to node_path(Node.trash)
+    redirect_to trashed_nodes_path
+
   rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotDestroyed => e
     flash[:error] = e.message
     redirect_to node_path(@node)
@@ -247,6 +248,11 @@ class NodesController < ApplicationController
     @sitemap_descendant_counts = descendant_counts_for(@sitemap)
   end
 
+  def trashed
+    @nodes = Node.trash.children.order(:slug)
+                 .paginate(:page => params[:page], :per_page => 50)
+  end
+
   private
 
     def slug_for(title)