From 4f96441f260279a82bbdff6df2f45b98aa4ef4f6 Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Tue, 29 Mar 2022 11:18:46 +0300 Subject: [PATCH] Add missing partial and wildcard search on `/admin/blocked_domains` --- app/controllers/admin/blocked_domains_controller.rb | 11 +++-------- app/services/partial_search_formatter.rb | 5 +++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/blocked_domains_controller.rb b/app/controllers/admin/blocked_domains_controller.rb index 268eaca73..c039c5de1 100644 --- a/app/controllers/admin/blocked_domains_controller.rb +++ b/app/controllers/admin/blocked_domains_controller.rb @@ -5,7 +5,7 @@ module Admin def index params[:q] ||= {} domains = BlockedDomain.all.order(:name) - @q = domains.ransack(params[:q]) + @q = domains.ransack(PartialSearchFormatter.format(params[:q])) @domains = @q.result.page(params[:page]) @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i.positive? @@ -13,13 +13,10 @@ module Admin end def new - @domain = BlockedDomain.new - end def create - @domain = BlockedDomain.new(blocked_domain_params) if @domain.save @@ -29,18 +26,16 @@ module Admin flash.now[:alert] = I18n.t('failed_to_add_domain') render 'new' end - end def delete - if BlockedDomain.find(params[:id]).destroy flash[:notice] = I18n.t('domain_deleted') - redirect_to admin_blocked_domains_path else flash.now[:alert] = I18n.t('failed_to_delete_domain') - redirect_to admin_blocked_domains_path end + + redirect_to admin_blocked_domains_path end def blocked_domain_params diff --git a/app/services/partial_search_formatter.rb b/app/services/partial_search_formatter.rb index 87ad602ed..c65184d08 100644 --- a/app/services/partial_search_formatter.rb +++ b/app/services/partial_search_formatter.rb @@ -1,11 +1,12 @@ class PartialSearchFormatter - def self.format(search_params) + def self.format(params) percentage = '%' + search_params = params.deep_dup search_params.each do |key, value| next unless key.include?('matches') && value.present? - value.prepend(percentage).concat(percentage) + value << percentage end search_params