fix conflict

513018b3 · Huỳnh Thiên Phước · d1626af3 · 513018b3
Commit 513018b3 authored Sep 01, 2020 by Huỳnh Thiên Phước
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

app/controllers/applied_jobs_controller.rb
+1 -1

No files found.
--- a/app/controllers/applied_jobs_controller.rb
+++ b/app/controllers/applied_jobs_controller.rb
@@ -38,7 +38,7 @@ class AppliedJobsController < ApplicationController
    @job = Job.find_by(id: session[:apply_job]['job_id'])
    @job_applied = current_user.job_applieds.new(apply_params)
    @job_applied.job_id = @job.id if @job_applied.job_id.blank?
-    @job_applied.cv_user.retrieve_from_cache!(apply_params[:cv_user])
+    @job_applied.cv_user.retrieve_from_cache!(session[:cv])
    if @job_applied.save
      AppliedJobMailer.apply_job(@job_applied, @job).deliver_later
      AppliedJobMailer.sending_admin(@job_applied, @job, ENV['GMAIL_USERNAME']).deliver_later