diff options
author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:58 +0000 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:58 +0000 |
commit | ea04caec95cea132143997a1870ae8dd1fc0db5c (patch) | |
tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /app/controllers/application_controller.rb | |
parent | 59b5b15d56600ffc26d657dfea134ffcfc879725 (diff) | |
parent | a76010c99459559a29901ed75b847384248c7c6e (diff) |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1849f23f3..b681f455d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -363,7 +363,10 @@ class ApplicationController < ActionController::Base else @page = this_page end - return InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) + result = InfoRequest.full_search(models, @query, order, ascending, collapse, @per_page, @page) + result.results # Touch the results to load them, otherwise accessing them from the view + # might fail later if the database has subsequently been reopened. + return result end def get_search_page_from_params return (params[:page] || "1").to_i |