Changeset 150

Show
Ignore:
Timestamp:
10/10/06 22:01:57 (2 years ago)
Author:
ahorn
Message:

corex branch: move Cachable module methods to controllers

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/corex/radiant/app/controllers/admin/page_controller.rb

    r148 r150  
    1 require_dependency 'cacheable' 
    2  
    31class Admin::PageController < ApplicationController 
    42   
    53  model :page 
    64   
    7   include Cacheable 
    8  
    95  def index 
    106    @homepage = Page.find_by_parent_id(nil) 
    …… 
    114110      true 
    115111    end 
     112 
     113    def clear_cache_directory 
     114      Dir["#{self.class.page_cache_directory}/*"].each do |f| 
     115        FileUtils.rm_rf f 
     116      end 
     117    end 
     118 
    116119end 

  • branches/corex/radiant/app/controllers/site_controller.rb

    r148 r150  
    1 require_dependency 'cacheable' 
    2  
    31class SiteController < ApplicationController 
    4  
    5   include Cacheable 
    62 
    73  session :off 
    …… 
    2824    redirect_to(:controller => 'admin/welcome') 
    2925  end 
    30    
     26 
    3127  private 
    3228     
    …… 
    4440    end 
    4541 
    46     def perform_caching? 
    47       (!@page.nil? and @page.cache?) and live? 
     42    def perform_caching 
     43      super and (!@page.nil? and @page.cache?) and live? 
    4844    end 
    4945