aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-07-26 02:39:57 +0200
committerDavid Cabo <david@calibea.com>2011-07-26 02:39:57 +0200
commit058a65ae0d079729b10a2954c472c336dce43245 (patch)
tree91543599b6db6538ceb2cdb36aaa9057ffe066fc /app/controllers/general_controller.rb
parent1ac1e5df9e1b8e670fbab1d2c65de6ce28232602 (diff)
parent04927e448f99f67bbfde88dd466f03fb23373b28 (diff)
Merge branch 'master' of github.com:sebbacon/alaveteli into asktheeu
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 6e5c8c3fd..ffc97237a 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -20,9 +20,8 @@ class GeneralController < ApplicationController
# New, improved front page!
def frontpage
-
+ medium_cache
behavior_cache do
-
# get some example searches and public bodies to display
# either from config, or based on a (slow!) query if not set
body_short_names = MySociety::Config.get('FRONTPAGE_PUBLICBODY_EXAMPLES', '').split(/\s*;\s*/).map{|s| "'%s'" % s.gsub(/'/, "''") }.join(", ")
@@ -66,6 +65,7 @@ class GeneralController < ApplicationController
# Display WhatDoTheyKnow category from mySociety blog
def blog
+ medium_cache
@feed_autodetect = []
feed_url = MySociety::Config.get('BLOG_FEED', '')
if not feed_url.empty?
@@ -176,6 +176,7 @@ class GeneralController < ApplicationController
end
def custom_css
+ long_cache
@locale = self.locale_from_params()
render(:layout => false, :content_type => 'text/css')
end