Merge branch 'release/0.17' into wdtk

Conflicts:
    config/general.yml-example

1 files changed, 13 insertions, 0 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4b603b064..154697377 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -123,5 +123,18 @@ module ApplicationHelper
             yield
         end
     end
+
+    # We only want to cache request lists that have a reasonable chance of not expiring
+    # before they're requested again. Don't cache lists returned from specific searches
+    # or anything except the first page of results, just the first page of the default
+    # views
+    def request_list_cache_key
+        cacheable_param_list = ['controller', 'action', 'locale', 'view']
+        if params.keys.all?{ |key| cacheable_param_list.include?(key) }
+            "request-list-#{@view}-#{@locale}"
+        else
+            nil
+        end
+    end
 end