Browse Source

added search param var

pull/608/head
JG 3 years ago
parent
commit
c8fdf6b34f
  1. 2
      app/components/search_component.rb
  2. 10
      app/controllers/case_logs_controller.rb

2
app/components/search_component.rb

@ -13,6 +13,8 @@ class SearchComponent < ViewComponent::Base
user_path(current_user)
elsif request.path.include?("organisations")
organisations_path
elsif request.path.include?("logs")
case_logs_path
end
end

10
app/controllers/case_logs_controller.rb

@ -11,13 +11,17 @@ class CaseLogsController < ApplicationController
def index
set_session_filters
all_logs = current_user.case_logs
@pagy, @case_logs = pagy(
filtered_case_logs(
filtered_collection(
current_user.case_logs, params["search-field"]
all_logs, search_term
),
),
)
@searched = search_term.presence
@total_count = all_logs.size
respond_to do |format|
format.html
@ -92,6 +96,10 @@ private
API_ACTIONS = %w[create show update destroy].freeze
def search_term
params["search"]
end
def json_api_request?
API_ACTIONS.include?(request["action"]) && request.format.json?
end

Loading…
Cancel
Save