@@ -6,16 +6,10 @@ class BaseController < ApplicationController include AuthenticatedSystem before_filter :login_from_cookie - caches_action :site_index, :footer_content - - def cache_action?(action_name) - !logged_in? && controller_name.eql?('base') && params[:format].blank? - end - def action_fragment_key(options) - url = url_for(options).split('://').last - url = (url =~ /^.*\/$/) ? "#{url}index" : url - url - end + caches_action :site_index, :footer_content, :if => Proc.new{|c| c.cache_action? } + def cache_action? + !logged_in? && controller_name.eql?('base') && params[:format].blank? + end if AppConfig.closed_beta_mode before_filter :beta_login_required, :except => [:teaser] app/controllers/base_controller.rb @@ -4,8 +4,8 @@ class PostsController < BaseController uses_tiny_mce(:options => AppConfig.simple_mce_options, :only => [:show]) cache_sweeper :post_sweeper, :only => [:create, :update, :destroy] - caches_action :show - def cache_action?(action_name) + caches_action :show, :if => Proc.new{|c| c.cache_action? } + def cache_action? !logged_in? && controller_name.eql?('posts') end app/controllers/posts_controller.rb @@ -1,9 +1,6 @@ class SitemapController < BaseController layout false - caches_action :index - def cache_action?(action_name) - true - end + caches_action :index def index @users = User.find(:all, :select => 'id, login, updated_at, login_slug', :conditions => "activated_at IS NOT NULL") app/controllers/sitemap_controller.rb @@ -916,9 +916,6 @@ div.progressBar div.background { margin: 0 0 0; } -.poll_excerpt { - padding-left: 20px; - background: url(/images/icons/poll.png) no-repeat left; } table.poll { width: 100%; margin-bottom: 3em; } assets/stylesheets/screen.css @@ -57,11 +57,9 @@ module AuthenticatedSystem def authorized? true end - def admin? logged_in? && current_user.admin? end - def moderator? logged_in? && current_user.moderator? end lib/authenticated_system.rb engine_plugins/action_cache/CHANGELOG engine_plugins/action_cache/MIT-LICENSE engine_plugins/action_cache/README engine_plugins/action_cache/about.yml engine_plugins/action_cache/init.rb engine_plugins/action_cache/lib/action_cache.rb engine_plugins/action_cache/rakefile engine_plugins/action_cache/test/action_cache_test.rb 8cfe00907820ce4422fb6657d36180d332fdf551 Bruno Bornsztein bruno@otis.local http://github.com/bborn/communityengine/commit/f724aa1328c41203d8be5262a386bd918c86f826 f724aa1328c41203d8be5262a386bd918c86f826 2008-06-12T10:38:51-07:00 2008-06-12T10:38:51-07:00 fixed caching, removed action_cache plugin and now using Rails 2.1 default caching 075f39ef9def8a9f8ebf58cd5741aedf8414f743 Bruno Bornsztein bruno@otis.local