forked from bofh/fetsite
Merge branch 'master' of https://github.com/andreassteph/fetsite
This commit is contained in:
@@ -37,7 +37,7 @@ class HomeController < ApplicationController
|
||||
def search
|
||||
|
||||
unless params['query'].nil? || params['query'].empty?
|
||||
@results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe do
|
||||
@results = Sunspot.search Neuigkeit,Rubrik, Fetprofile, Thema, Themengruppe, Lva, Studium, Modul, Modulgruppe, Gremium do
|
||||
fulltext params['query']
|
||||
end
|
||||
@neuigkeiten=[];
|
||||
@@ -46,6 +46,11 @@ class HomeController < ApplicationController
|
||||
else
|
||||
# @neuigkeiten =Neuigkeit.search(params['query']).public
|
||||
end
|
||||
@res=[]
|
||||
@results.results.each do |r|
|
||||
@res << r if can?(:show,r)
|
||||
end
|
||||
|
||||
# @fetprofiles = Fetprofile.search(params['query'])
|
||||
@fetprofiles=[]
|
||||
# if can?(:showintern, Neuigkeit)
|
||||
|
||||
Reference in New Issue
Block a user