diff --git a/app/controllers/competition_infos_controller.rb b/app/controllers/competition_infos_controller.rb index e495de81..8b81c153 100644 --- a/app/controllers/competition_infos_controller.rb +++ b/app/controllers/competition_infos_controller.rb @@ -8,7 +8,8 @@ class CompetitionInfosController < ApplicationController def index competition_infos = CompetitionInfo.order(created_at: :desc) - competition_infos = competition_infos.where("title like ?", "%#{params[:name]}%") if params[:name].present? + competition_infos = competition_infos.where("competition_infos.title like ?", "%#{params[:name]}%") if params[:name].present? + competition_infos = competition_infos.joins(:watchers).where(watchers: { user_id: current_user.id }) if params[:category].to_s == "watched" @competition_infos = paginate(competition_infos) respond_to do |format| format.html