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

Added meta robots tag to the default layout; added error handling to published pages

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-11-01 07:31:44 +00:00
parent 9e7306fb0a
commit d3b25c8a19
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/application.rb
View file

@ -2,7 +2,7 @@
# Likewise will all the methods added be available for all controllers.
class ApplicationController < ActionController::Base
before_filter :connect_to_model, :setup_url_generator, :set_content_type_header
before_filter :connect_to_model, :setup_url_generator, :set_content_type_header, :set_robots_metatag
after_filter :remember_location, :teardown_url_generator
observer :page_observer
@ -152,6 +152,14 @@ class ApplicationController < ActionController::Base
end
end
def set_robots_metatag
if controller_name == 'wiki' and %w(show published).include? action_name
@robots_metatag_value = 'index,follow'
else
@robots_metatag_value = 'noindex,nofollow'
end
end
def setup_url_generator
PageRenderer.setup_url_generator(UrlGenerator.new(self))
end

13
app/controllers/wiki_controller.rb
View file

@ -195,12 +195,13 @@ class WikiController < ApplicationController
end
def published
if @web.published?
page = wiki.read_page(@web_name, @page_name || 'HomePage')
@renderer = PageRenderer.new(page.revisions.last)
else
redirect_home
end
render_text("Published version of web '#{@web_name}' is not available", 404) and return if not @web.published?
page_name = @page_name || 'HomePage'
page = wiki.read_page(@web_name, page_name)
render_text("Page '#{page_name}' not found", 404) and return unless page
@renderer = PageRenderer.new(page.revisions.last)
end
def revision