lib/merit/model_additions.rb in merit-0.6.3 vs lib/merit/model_additions.rb in merit-0.7.0

@@ -14,10 +14,10 @@
     end
   end
 
   def badges
     create_sash_if_none
-    Badge.find_by_id(sash.badge_ids)
+    sash.badge_ids.collect{|b_id| Badge.find(b_id) }
   end
 
   # Create sash if doesn't have
   def create_sash_if_none
     if sash.nil?