From 21c66cd27c185c15c995ab5cb94b7dfdf90db543 Mon Sep 17 00:00:00 2001 From: Jared Cosulich Date: Mon, 30 Jul 2018 11:50:12 -0400 Subject: [PATCH] fixing bug with merge into --- app/models/school.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/school.rb b/app/models/school.rb index 9fcf0216..63074ca5 100644 --- a/app/models/school.rb +++ b/app/models/school.rb @@ -24,9 +24,9 @@ class School < ApplicationRecord recipient_lists.update_all(school_id: school.id) recipients.update_all(school_id: school.id) school_categories.each do |school_category| - if school.school_categories.where(name: school_category.name).blank? + if school.school_categories.for(school_category.school, school_category.category).blank? school_category.update(school_id: school.id) - else + else school_category.destroy end end