app/models/merit/badge.rb in merit-3.0.3 vs app/models/merit/badge.rb in merit-4.0.0

- old
+ new

@@ -24,18 +24,10 @@ def by_level(level) find { |b| b.level.to_s == level.to_s } end end - def _mongoid_sash_in(sashes) - {:sash_id.in => sashes} - end - - def _active_record_sash_in(sashes) - {sash_id: sashes} - end - class << self def find_by_name_and_level(name, level) badges = Merit::Badge.by_name(name) badges = badges.by_level(level) unless level.nil? if (badge = badges.first).nil? @@ -49,10 +41,10 @@ # entries with certain badge. For instance, Badge.find(3).users # orm-specified def _define_related_entries_method(meritable_class_name) define_method(:"#{meritable_class_name.underscore.pluralize}") do sashes = BadgesSash.where(badge_id: id).pluck(:sash_id) - meritable_class_name.constantize.where(send "_#{Merit.orm}_sash_in", sashes) + meritable_class_name.constantize.where(sash_id: sashes) end end end end end