Merge branch 'erdgeist-revive-events'

1 files changed, 41 insertions, 41 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index d671384..37fd78b 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -1,74 +1,74 @@
 class AdminController < ApplicationController
-  
+
   # Private
-  
+
   before_action :login_required
 
   def index
-    @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)
+    @drafts = Node.drafts_and_autosaves(current_user_id: current_user.id).limit(5)
+    @recent_changes = Node.recently_changed.limit(5)
+  end
 
-    @mynodes = Node.joins(:pages)
-              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
-              .order("updated_at desc")
-              .uniq.first(50)
+  def conventions
+    @node_kinds = CccConventions::NODE_KINDS
   end
-  
+
   def search
-    @results = Node.search params[:search_term], :per_page => 1000
-    
+    @results = Node.editor_search(params[:search_term])
+
     respond_to do |format|
       format.html do
         render :template => 'admin/search_results'
       end
-      format.js do 
-        render( :json => @results.map do |node| 
+      format.js do
+        render( :json => @results.map do |node|
             if node
               { :id => node.id, :title => node.title, :unique_name => node.unique_name, :node_path => node_path(node) }
             end
           end
         )
-        
-      end 
+
+      end
+    end
+  end
+
+  def dashboard_search
+    term = params[:search_term]
+
+    if term.blank?
+      render json: { tags: [], nodes: [] }
+      return
     end
+
+    render json: {
+      tags: ActsAsTaggableOn::Tag.named_like(term).limit(5).map { |tag|
+        { name: tag.name, tag_path: tags_nodes_path(tags: tag.name) }
+      },
+      nodes: Node.editor_search(term).limit(10).map { |node|
+        { node_id: node.id, title: node.title, unique_name: node.unique_name, node_path: node_path(node) }
+      }
+    }
   end
-  
+
   def menu_search
     if params[:search_term] == "Root"
       @results = [Node.root]
     else
-      @results = Node.search params[:search_term]
+      @results = Node.editor_search(params[:search_term])
     end
-    
+
     respond_to do |format|
       format.html do
         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} 
+
+      format.js do
+        render( :json => @results.map do |node|
+          {:node_id => node.id, :title => node.title, :unique_name => node.unique_name, :node_path => node_path(node)}
           end
         )
-        
-      end 
+
+      end
     end
   end
-  
 end