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

Wikilinks to Published Webs

Browse source 
Should be to the published action. This
didn't work right for inter-web links.
(Reported by Mike Shulman)

Also, change some .length's to .size's
(for Andrew Stacey)
This commit is contained in:
Jacques Distler 2009-09-03 23:09:10 -05:00
parent 888e93a7fd
commit 342298ed0e
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/url_generator.rb
View file

@ -10,7 +10,8 @@ class AbstractUrlGenerator
# Create a link for the given page (or file) name and link text based
# on the render mode in options and whether the page (file) exists
# in the web.
def make_link(asked_name, web, text = nil, options = {})
def make_link(current_web, asked_name, web, text = nil, options = {})
@web = current_web
mode = (options[:mode] || :show).to_sym
link_type = (options[:link_type] || :show).to_sym
@ -105,7 +106,9 @@ class UrlGenerator < AbstractUrlGenerator
end
when :show
if known_page
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'show',
web = Web.find_by_address(web_address)
action = web.published? && web != @web ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
else