diff --git a/app/controllers/member_counselors_controller.rb b/app/controllers/member_counselors_controller.rb index 247f0bb..c76cee9 100644 --- a/app/controllers/member_counselors_controller.rb +++ b/app/controllers/member_counselors_controller.rb @@ -38,9 +38,9 @@ class MemberCounselorsController < CUserController files = [] city = HpsCity.find(params[:city_id]) if !params[:type].present? || params[:type] == "proposals" - hpsfiles = HpsFile.where(:hps_city_id => city.id).order_by([:year, :desc],[:created_at, :desc]).page(params[:page]).per(10) + hpsfiles = HpsFile.where(:hps_city_id => city.id, :hps_member_id.in => members).order_by([:year, :desc],[:created_at, :desc]).page(params[:page]).per(10) elsif params[:type] == "results" - hpsfiles = HpsResult.where(:hps_city_id => city.id).order_by([:year, :desc],[:created_at, :desc]).page(params[:page]).per(10) + hpsfiles = HpsResult.where(:hps_city_id => city.id, :hps_member_id.in => members).order_by([:year, :desc],[:created_at, :desc]).page(params[:page]).per(10) end hpsfiles.each do |file| files << {