diff --git a/app/models/sheet.rb b/app/models/sheet.rb index 5fc5ca8..130596e 100644 --- a/app/models/sheet.rb +++ b/app/models/sheet.rb @@ -124,7 +124,7 @@ class Sheet < ActiveRecord::Base - return Sheet.all(:conditions => conditions,:include => :person) + return Sheet.includes(:person).where(conditions) end