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 2011-09-09 11:35:26 -05:00
parent 60a595de17 eff8c87d39
commit 1f8a4fe282
3 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/file_controller.rb
View file

@ -18,8 +18,8 @@ class FileController < ApplicationController
new_file = @web.wiki_files.create(params['file']) new_file = @web.wiki_files.create(params['file'])
if new_file.valid? if new_file.valid?
flash[:info] = "File '#{@file_name}' successfully uploaded" flash[:info] = "File '#{@file_name}' successfully uploaded"
WikiReference.pages_that_want_file(@web, @file_name).each do |page| WikiReference.pages_that_link_to_file(@web, @file_name).each do |page|
RevisionSweeper.expire_page(page) RevisionSweeper.expire_page(@web, page)
end end
redirect_to(params['referring_page']) redirect_to(params['referring_page'])
else else

4
app/controllers/revision_sweeper.rb
View file

@ -25,8 +25,8 @@ class RevisionSweeper < ActionController::Caching::Sweeper
end end
end end
def self.expire_page(page) def self.expire_page(web, page_name)
new.expire_caches(page) new.expire_cached_page(web, page_name)
end end
private private

11
app/models/wiki_reference.rb
View file

@ -46,20 +46,11 @@ class WikiReference < ActiveRecord::Base
query = 'SELECT name FROM pages JOIN wiki_references ' + query = 'SELECT name FROM pages JOIN wiki_references ' +
'ON pages.id = wiki_references.page_id ' + 'ON pages.id = wiki_references.page_id ' +
'WHERE wiki_references.referenced_name = ? ' + 'WHERE wiki_references.referenced_name = ? ' +
"AND wiki_references.link_type in ('#{FILE}') " + "AND wiki_references.link_type in ('#{FILE}','#{WANTED_FILE}') " +
"AND pages.web_id = '#{web.id}'" "AND pages.web_id = '#{web.id}'"
names = connection.select_all(sanitize_sql([query, file_name])).map { |row| row['name'] } names = connection.select_all(sanitize_sql([query, file_name])).map { |row| row['name'] }
end end
def self.pages_that_want_file(web, file_name)
query = 'SELECT name FROM pages JOIN wiki_references ' +
'ON pages.id = wiki_references.page_id ' +
'WHERE wiki_references.referenced_name = ? ' +
"AND wiki_references.link_type in ('#{WANTED_FILE}') " +
"AND pages.web_id = '#{web.id}'"
names = connection.select_all(sanitize_sql([query, file_name])).map { |row| row['name'] }
end
def self.pages_that_include(web, page_name) def self.pages_that_include(web, page_name)
query = 'SELECT name FROM pages JOIN wiki_references ' + query = 'SELECT name FROM pages JOIN wiki_references ' +
'ON pages.id = wiki_references.page_id ' + 'ON pages.id = wiki_references.page_id ' +