Fixed sql search for will_paginate 3.0 and activerecord 3.1 #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -22,14 +22,16 @@ class SearchEngine::Sql < SearchEngine::Base | |||
| order = opts[:order] || "LOWER(#{self.table_name}.name) ASC" | |||
|
|
|||
| pagination_options = {} | |||
| pagination_options[:page] = opts.delete(:page) if opts[:page].present? | |||
| pagination_options[:page] = opts[:page].present? ? opts.delete(:page) : 1 | |||
There was a problem hiding this comment.
I was getting an error from will_paginate that "page is required", if it was nil, so I set a default of 1.
| @@ -48,8 +50,17 @@ class SearchEngine::Sql < SearchEngine::Base | |||
| end | |||
|
|
|||
| def self.search(query, options = {}) | |||
| SearchEngine.searchable_models.map {|model| | |||
| model.to_s.constantize.search(query, options) | |||
| }.flatten | |||
There was a problem hiding this comment.
This was returning a flattened array instead of an object with a total_entries method (like what's returned by will_paginate), which was causing an error in the search view whenever there was more than 1 result.
reidab
added a commit
that referenced
this pull request
Nov 16, 2011
Fixed sql search for will_paginate 3.0 and activerecord 3.1
|
Thanks for fixing this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed sql-based search for will_paginate 3.0 and activerecord 3.1. I noticed there weren't any specs for this, and I don't really have time to write any specs for the search at the moment, unfortunately. But I figured at least this was a start (see inline notes for additional context).
With this and #53, I now have this app running on Heroku's Cedar stack (cc #45).