Commit ea6a2b1f by Xuan Trung Le

fix bugs

parent de991caa
......@@ -9,7 +9,7 @@ class MyPagesController < ApplicationController
end
def history
@jobs = current_user.viewed_jobs.includes(:apply_jobs).includes(:company).limit(20)
@jobs = current_user.viewed_jobs.includes(:apply_jobs).includes(:company).limit(Settings.top.job_per_history_page)
end
def download_cv
......
......@@ -48,9 +48,10 @@ class User < ApplicationRecord
end
def my_jobs
Job.select(:'jobs.id', :'jobs.name', :'jobs.salary', :'jobs.description', :'apply_jobs.created_at', :'companies.location').
joins(:company, :apply_jobs).
where(apply_jobs: { user_id: self.id })
Job.select(:'jobs.id', :'jobs.name', :'jobs.salary', :'jobs.description',
:'companies.location', :'apply_jobs.created_at')
.joins(:company, :apply_jobs)
.where(apply_jobs: { user_id: id })
end
private
......
......@@ -3,6 +3,7 @@ defaults: &defaults
job_per_page: 5
industry_per_page: 9
city_per_page: 9
job_per_history_page: 20
development:
<<: *defaults
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment