@@ -43,7 +43,11 @@ module RPH return [] if search_terms.blank? klass = to_model(@klass) - sanitized_sql_conditions = klass.send(:sanitize_sql_for_conditions, build_conditions_for(search_terms)) + + conditions = "(#{build_conditions_for(search_terms)})" + conditions << " AND (#{options[:conditions]})" unless options[:conditions].blank? + sanitized_sql_conditions = klass.send(:sanitize_sql_for_conditions, conditions) + klass.find(:all, :select => "DISTINCT #{@klass.to_s}.*", :conditions => sanitized_sql_conditions, :order => options[:order], :limit => options[:limit]) end lib/easy_search/core.rb 94b6c6199ed0af7b1f2cd7f78469f5e922ff3289 rpheath rpheath rpheath@gmail.com http://github.com/rpheath/easy_search/commit/912cce07d7373f11c72a3935cc3782c379f0a3fd 912cce07d7373f11c72a3935cc3782c379f0a3fd 2008-07-28T08:09:29-07:00 2008-07-28T08:09:29-07:00 added ability to add additional conditions aside from search terms only 372319e308c9971e1bc9b813e385fa559dcd6ceb rpheath rpheath rpheath@gmail.com