fix bug

parent 033e166f
Pipeline #914 failed with stages
in 0 seconds
......@@ -27,14 +27,13 @@ class JobsController < ApplicationController
end
def show
@job = Job.find(params[:id])
redirect_to jobs_path unless @job
end
private
def set_job
@job ||= Job.find_by(params[:id])
@job ||= Job.find_by_id(params[:id])
end
def general_variables
......
class UsersController < ApplicationController
before_action :signed_in_user, only: [:update, :my_page, :my_info]
def my_page
@user = current_user
end
def my_info
@user = current_user
end
def update
@user = current_user
if BCrypt::Password.new(@user.password_digest) != change_password[:oldpassword]
flash.now[:danger] = 'Old Password is mismatch'
else
if @user.update_attributes(user_params)
flash[:success] = 'Updated Successfully'
redirect_to my_page_path
else
respond_to do |format|
format.js
end
end
end
end
private
def signed_in_user
unless signed_in?
flash[:warning] = "Please Sign In..."
redirect_to login_path
end
end
def user_params
params.require(:user).permit(:name, :email, :cv_user, :password)
end
def change_password
params.require(:user).permit(:oldpassword)
end
end
module SessionsHelper
def sign_in(user)
remember_token = User.new_remember_token
cookies.permanent[:remember_token] = remember_token
user.update_attribute(:remember_token, User.digest(remember_token))
self.current_user = user
end
def signed_in?
current_user.present?
end
def current_user=(user)
@current_user = user
end
def current_user
remember_token = User.digest(cookies[:remember_token])
@current_user ||= User.find_by(remember_token: remember_token)
end
def sign_out
# current_user.update_attribute(:remember_token, User.digest(User.new_remember_token))
cookies.delete(:remember_token)
self.current_user = nil
end
end
......@@ -39,7 +39,7 @@ class CSVImporter
def import_file_csv
CSV.foreach(@importer, headers: true) do |row|
begin
company_name = row["company name"]
company_name = row["company name"].to_s
next if company_name.blank?
company_address = row["company address"]
......@@ -48,7 +48,7 @@ class CSVImporter
address: company_address,
introduction: company_introduction)
title_job = row["name"]
title_job = row["name"].to_s
next if title_job.blank?
description_job = "#{row["description"]} #{row["requirement"]}"
......
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