mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
Fix all the errors to get our tests green on Rails 5.1.
This commit is contained in:
@@ -2,7 +2,7 @@ require_dependency 'search'
|
||||
|
||||
class SearchController < ApplicationController
|
||||
|
||||
skip_before_filter :check_xhr, only: :show
|
||||
skip_before_action :check_xhr, only: :show
|
||||
|
||||
def self.valid_context_types
|
||||
%w{user topic category private_messages}
|
||||
@@ -77,14 +77,14 @@ class SearchController < ApplicationController
|
||||
params.require(:search_result_id)
|
||||
|
||||
if params[:search_result_type] == 'topic'
|
||||
where = { id: params[:search_log_id] }
|
||||
attributes = { id: params[:search_log_id] }
|
||||
if current_user.present?
|
||||
where[:user_id] = current_user.id
|
||||
attributes[:user_id] = current_user.id
|
||||
else
|
||||
where[:ip_address] = request.remote_ip
|
||||
attributes[:ip_address] = request.remote_ip
|
||||
end
|
||||
|
||||
SearchLog.where(where).update_all(
|
||||
SearchLog.where(attributes).update_all(
|
||||
clicked_topic_id: params[:search_result_id]
|
||||
)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user