Merge remote-tracking branch 'origin'

2015-01-03 10:54:48 +01:00
parent 3799e5f842 aa080a1eec
commit 81f1db8ff6
81 changed files with 974 additions and 74 deletions
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -112,13 +112,13 @@ class NeuigkeitenController < ApplicationController
    end   

    @calentries1=@neuigkeit.calentries
-    @nlink_search = Neuigkeit::LINKTYPES.clone
+    nlink_search = Neuigkeit::LINKTYPES.clone
+    nlink_search.collect!{|t| t.constantize}
+   # @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
+    @results= Sunspot.search nlink_search do 
+      fulltext params[:query]
+    end
    
-    @nlink_search.collect!{|t| t.constantize}
-    @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
-
-
-    @nlink_search.flatten!
    respond_to do |format|
      format.html { render action:"show" }
      format.js