avatar

30

bug fix

by abloke, 02 Feb, 2007 04:33 PM
29 30  
4444   def self.find_with(options={})
4545     limit = (options.delete(:limit) || 10)
4646     order = options.delete(:order)
47     if options[:additional]
48       additionals = options[:additional].is_a?Array ? options[:additional] : [options[:additional]]
47     if options.keys.include? :additional
48       additionals = options[:additional].is_a?(Array) ? options[:additional] : [options[:additional]]
4949     end
5050     options.delete(:additional)
5151     conditions = self.build_sql_conditional_for(options)
52     conditions << (conditions ? " AND " : "") << options[:additional].join(" #{operator || "AND"} ") if options[:additional]
52     conditions << (conditions ? " AND " : "") << options[:additional].join(" #{operator || "AND"} ") if additionals
5353     self.find(:all, :conditions => conditions, :limit => limit, :order => order)
5454   end
5555