From d2074ada79f2644b666850372f8756f6f5ba2b28 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Tue, 6 Dec 2016 13:09:42 -0500 Subject: [PATCH] fix policy scope errors in search controller (#947) --- app/controllers/search_controller.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index c9fcc7db..c488c556 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -105,6 +105,7 @@ class SearchController < ApplicationController builder = builder.where(user: user) if user @maps = builder.order(:name) else + skip_policy_scope @maps = [] end @@ -120,10 +121,10 @@ class SearchController < ApplicationController term = term[7..-1] if term.downcase[0..6] == 'mapper:' search = term.downcase.strip + '%' - skip_policy_scope # TODO: builder = policy_scope(User) - builder = User.where('LOWER("name") like ?', search) + builder = policy_scope(User).where('LOWER("name") like ?', search) @mappers = builder.order(:name) else + skip_policy_scope @mappers = [] end render json: autocomplete_user_array_json(@mappers).to_json @@ -146,6 +147,7 @@ class SearchController < ApplicationController @synapses = @one + @two @synapses.sort! { |s1, s2| s1.desc <=> s2.desc }.to_a else + skip_policy_scope @synapses = [] end