Migration from Rails 2.3.5 to Rails 8.1 successful.

Merging dev branch.

1 files changed, 31 insertions, 17 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 1d1a1ca..9e8564e 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -2,31 +2,46 @@ class AdminController < ApplicationController
   
   # Private
   
-  before_filter :login_required
+  before_action :login_required
 
   def index
-    @drafts = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => ["draft_id IS NOT NULL"]
-    )
-    @recent_changes = Node.all(
-      :limit => 20,
-      :order => "updated_at desc",
-      :conditions => [ 
-        "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL", Time.now, Time.now-14.days
-      ]
-    )
+    @drafts = Node.where("draft_id IS NOT NULL")
+      .limit(50).order("updated_at desc")
+
+    @drafts_count = Node.where("draft_id IS NOT NULL").count
+
+    @recent_changes = Node.where(
+      "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL",
+      Time.now, Time.now - 14.days
+    ).limit(50).order("updated_at desc")
+
+    all_nodes = Node.root.self_and_descendants
+    @sitemap_depth = {}
+    Node.each_with_level(all_nodes) do |node, level|
+      @sitemap_depth[node.id] = level
+    end
+    @sitemap = all_nodes.to_a.sort! { |node1,node2| node1.lft <=> node2.lft }.delete_if { |node| node.update? }
+
+    @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
+
+    @mynodes = Node.joins(:pages)
+              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
+              .order("updated_at desc")
+              .uniq.first(50)
   end
   
   def search
-    @results = Node.search params[:search_term]
+    @results = Node.search params[:search_term], :per_page => 1000
     
     respond_to do |format|
-      format.html
+      format.html do
+        render :template => 'admin/search_results.html'
+      end
       format.js do 
         render( :json => @results.map do |node| 
-          {:id => node.id, :title => node.title, :edit_path => node_path(node)} 
+            if node
+              {:id => node.id, :title => node.title, :edit_path => node_path(node)}
+            end
           end
         )
         
@@ -46,7 +61,6 @@ class AdminController < ApplicationController
         render :partial => 'admin/menu_search_results'
       end
       
-      
       format.js do 
         render( :json => @results.map do |node| 
           {:node_id => node.id, :title => node.title, :unique_name => node.unique_name}