Index: vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb =================================================================== --- vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb (revision 1524) +++ vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb (working copy) @@ -27,7 +27,9 @@ return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods) cattr_accessor :searchable_options - self.searchable_options = options + + self.searchable_options = { :project_key => "project_id", :date_column => "created_on"} + searchable_options.update(options) if options.is_a?(Hash) if searchable_options[:columns].nil? raise 'No searchable column defined.' @@ -35,20 +37,6 @@ searchable_options[:columns] = [] << searchable_options[:columns] end - if searchable_options[:project_key] - elsif column_names.include?('project_id') - searchable_options[:project_key] = "#{table_name}.project_id" - else - raise 'No project key defined.' - end - - if searchable_options[:date_column] - elsif column_names.include?('created_on') - searchable_options[:date_column] = "#{table_name}.created_on" - else - raise 'No date column defined defined.' - end - # Permission needed to search this model searchable_options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless searchable_options.has_key?(:permission)