From 300658f8dd525a7b19f4920b273b2f529cef2463 Mon Sep 17 00:00:00 2001 From: "vilet.yy" Date: Fri, 2 Apr 2021 11:18:28 +0800 Subject: [PATCH] fix: apply_signature filter --- app/controllers/apply_signatures_controller.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/controllers/apply_signatures_controller.rb b/app/controllers/apply_signatures_controller.rb index 885249cf..2903ca94 100644 --- a/app/controllers/apply_signatures_controller.rb +++ b/app/controllers/apply_signatures_controller.rb @@ -5,8 +5,9 @@ class ApplySignaturesController < ApplicationController before_action :find_apply_signature, only: [:update] def index + search = params[:search].to_s.downcase @apply_signatures = @project.apply_signatures.with_status(status).includes(user: :user_extension) - @apply_signatures = @apply_signatures.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") + @apply_signatures = @apply_signatures.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") unless search.blank? @apply_signatures = kaminari_paginate(@apply_signatures) end @@ -64,10 +65,6 @@ class ApplySignaturesController < ApplicationController params.permit(:status) end - def search - params.fetch(:search, "").to_s.downcase - end - def status params.fetch(:status, "all") end