From b8da4b081ef803cabb3e916fcf463fe9d6534d4a Mon Sep 17 00:00:00 2001 From: Bohung Date: Sat, 19 Mar 2022 11:51:48 +0800 Subject: [PATCH] Fix answer search bug. --- app/controllers/admin/surveys_controller.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/surveys_controller.rb b/app/controllers/admin/surveys_controller.rb index 06c3e03..a2281ba 100644 --- a/app/controllers/admin/surveys_controller.rb +++ b/app/controllers/admin/surveys_controller.rb @@ -29,9 +29,13 @@ class Admin::SurveysController < OrbitAdminController if can_edit_or_delete?(@survey) @table_fields = ['survey.taken_by', 'survey.taken_date',"survey.records"] @survey_answer_groups = @survey.survey_answer_groups.desc(:last_modified).page(params[:page]).per(15) - if params[:search] - match_user_ids = User.where(:id.in=>@survey.survey_answer_groups.pluck(:user),:member_name=>/#{params[:search]}/).pluck(:id) rescue []; - @survey_answer_groups = @survey_answer_groups.where(:user.in=>match_user_ids) + if params[:search].present? + if params[:search] == "NA" + @survey_answer_groups = @survey_answer_groups.where(:user=>nil) + else + match_user_ids = User.where(:id.in=>@survey.survey_answer_groups.pluck(:user),:member_name=>/#{params[:search]}/).pluck(:id) rescue []; + @survey_answer_groups = @survey_answer_groups.where(:user.in=>match_user_ids) + end end @answer_repeat = @survey.get_answer_repeat else