diff --git a/app/controllers/admin/education/programs/teachers_controller.rb b/app/controllers/admin/education/programs/teachers_controller.rb index 253c7cf4276bafd2f9955b16265b84c4355cdd38..e5f379ea2a96f00884ca4f94a11d267cbbac7b9b 100644 --- a/app/controllers/admin/education/programs/teachers_controller.rb +++ b/app/controllers/admin/education/programs/teachers_controller.rb @@ -51,7 +51,12 @@ class Admin::Education::Programs::TeachersController < Admin::Education::Program def get_available_people used_person_ids = @program.university_person_involvements.where.not(id: @involvement.id).pluck(:person_id) - @available_people = current_university.people.for_language_id(current_university.default_language_id).teachers.where.not(id: used_person_ids).accessible_by(current_ability).ordered + @available_people = current_university.people + .for_language_id(current_university.default_language_id) + .teachers + .where.not(id: used_person_ids) + .accessible_by(current_ability) + .ordered end def breadcrumb diff --git a/app/models/concerns/with_featured_image.rb b/app/models/concerns/with_featured_image.rb index 78756bac40631abacedcc938679689f314ff7a62..d7f8102d2d1fa8bdffe9a164adc8598a1c6b8bde 100644 --- a/app/models/concerns/with_featured_image.rb +++ b/app/models/concerns/with_featured_image.rb @@ -33,21 +33,16 @@ module WithFeaturedImage photo = Unsplash::Photo.find id url = "#{photo['urls']['full']}&w=2048&fit=max" filename = "#{photo['id']}.jpg" - begin - file = URI.open url - featured_image.attach(io: file, filename: filename) - photo.track_download - rescue - end + file = URI.open url + featured_image.attach(io: file, filename: filename) + photo.track_download end def photo_import_pexels(id) photo = Pexels::Client.new.photos.find id url = "#{photo.src['original']}?auto=compress&cs=tinysrgb&w=2048" filename = "#{photo.id}.png" - begin - file = URI.open url - featured_image.attach(io: file, filename: filename) - end + file = URI.open url + featured_image.attach(io: file, filename: filename) end end diff --git a/app/models/concerns/with_translations.rb b/app/models/concerns/with_translations.rb index dfac724c0b835217ee10b9a05d2725f8e0399854..120df204a0286e5989d675c24bfeadef8a36b951 100644 --- a/app/models/concerns/with_translations.rb +++ b/app/models/concerns/with_translations.rb @@ -6,8 +6,9 @@ module WithTranslations belongs_to :original, class_name: base_class.to_s, optional: true has_many :translations, class_name: base_class.to_s, foreign_key: :original_id, dependent: :nullify - scope :for_language_id, -> (language_id) { where(language_id: language_id) } scope :for_language, -> (language) { for_language_id(language.id) } + # The for_language_id scope can be used when you have the ID without needing to load the Language itself + scope :for_language_id, -> (language_id) { where(language_id: language_id) } end def available_languages