deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-12-13 21:16:26 -06:00
commit 5899e19611
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/cache_sweeping_helper.rb
View file

@ -2,7 +2,7 @@ module CacheSweepingHelper
def expire_cached_page(web, page_name) def expire_cached_page(web, page_name)
expire_action :controller => 'wiki', :web => web.address, expire_action :controller => 'wiki', :web => web.address,
:action => %w(show published s5 tex print history), :id => page_name :action => %w(show published s5 tex print history source), :id => page_name
expire_action :controller => 'wiki', :web => web.address, expire_action :controller => 'wiki', :web => web.address,
:action => 'show', :id => page_name, :mode => 'diff' :action => 'show', :id => page_name, :mode => 'diff'
end end

1
app/controllers/revision_sweeper.rb
View file

@ -8,6 +8,7 @@ class RevisionSweeper < ActionController::Caching::Sweeper
def before_save(record) def before_save(record)
if record.is_a?(Revision) if record.is_a?(Revision)
expire_cached_page(record.page.web, record.page.name)
expire_cached_revisions(record.page) expire_cached_revisions(record.page)
end end
end end

2
app/controllers/wiki_controller.rb
View file

@ -9,7 +9,7 @@ class WikiController < ApplicationController
before_filter :load_page before_filter :load_page
before_filter :dnsbl_check, :only => [:edit, :new, :save, :export_html, :export_markup] before_filter :dnsbl_check, :only => [:edit, :new, :save, :export_html, :export_markup]
caches_action :show, :published, :authors, :tex, :s5, :print, :recently_revised, :list, :file_list, caches_action :show, :published, :authors, :tex, :s5, :print, :recently_revised, :list, :file_list, :source,
:history, :revision, :atom_with_content, :atom_with_headlines, :if => Proc.new { |c| c.send(:do_caching?) } :history, :revision, :atom_with_content, :atom_with_headlines, :if => Proc.new { |c| c.send(:do_caching?) }
cache_sweeper :revision_sweeper cache_sweeper :revision_sweeper