Fix race condition for base skill mismatch check
This commit is contained in:
parent
a08421722f
commit
fc7cde4c5a
1 changed files with 2 additions and 2 deletions
|
|
@ -133,7 +133,7 @@ class Api::V1::JobsController < Api::V1::ApiController
|
||||||
def mismatched_skill(job, skill)
|
def mismatched_skill(job, skill)
|
||||||
mismatched_main = (skill.job.id != job.id) && skill.main && !skill.sub
|
mismatched_main = (skill.job.id != job.id) && skill.main && !skill.sub
|
||||||
mismatched_emp = (skill.job.id != job.id) && skill.emp
|
mismatched_emp = (skill.job.id != job.id) && skill.emp
|
||||||
mismatched_base = (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base
|
mismatched_base = skill.job.base_job && (job.row != 'ex2' || skill.job.base_job.id != job.base_job.id) && skill.base
|
||||||
|
|
||||||
if %w[4 5 ex2].include?(job.row)
|
if %w[4 5 ex2].include?(job.row)
|
||||||
true if mismatched_emp || mismatched_base || mismatched_main
|
true if mismatched_emp || mismatched_base || mismatched_main
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue