fix conflict in crawler

566e2225 · Huỳnh Thiên Phước · 02ef8dfd · 566e2225 · 566e2225
Commit 566e2225 authored Aug 14, 2020 by Huỳnh Thiên Phước
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

app/controllers/jobs_controller.rb
+1 -0

lib/src/csv_importer.rb
+1 -1

No files found.
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -27,6 +27,7 @@ class JobsController < ApplicationController
  end

  def show
+    @job = Job.find(params[:id])
    redirect_to jobs_path unless @job
  end


--- a/lib/src/csv_importer.rb
+++ b/lib/src/csv_importer.rb
@@ -58,7 +58,7 @@ class CSVImporter
                                     description: description_job,
                                     level: level,
                                     salary: salary,
-                                     company_id: company_id)
+                                     company_id: company.id)

        job = Job.find_or_create_by!(title: title_job,
                                     description: description_job,