Commit 45098883 by Ngô Trung Hưng

resolve conflict

parent 6c47054b
Pipeline #832 failed with stages
in 0 seconds
...@@ -7,8 +7,6 @@ class City < ApplicationRecord ...@@ -7,8 +7,6 @@ class City < ApplicationRecord
has_many :city_jobs has_many :city_jobs
has_many :jobs, through: :city_jobs has_many :jobs, through: :city_jobs
enum area: { international: 0, domestic:1} enum area: { international: 0, domestic:1}
has_many :jobs, through: :city_jobs
enum area: { international: 0, domestic: 1 }
scope :domestic, -> { where(area: 1) } scope :domestic, -> { where(area: 1) }
scope :international, -> { where(area: 0) } scope :international, -> { where(area: 0) }
scope :all_cities, -> { select :id, :name } scope :all_cities, -> { select :id, :name }
......
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