harrybomrah
/
hps_member
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fix

This commit is contained in:
Harry Bomrah 2017-08-21 16:40:38 +08:00
parent 032a17b9b6
commit 4b901a50e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/member_counselors_controller.rb
View File

@ -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 << {