Fix answer search bug.
This commit is contained in:
parent
444d308f06
commit
b8da4b081e
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue