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

Make Interweb Links Work Right

Browse source 
Links to a published web should be to the 'publish' action, not to the
'show' action. Previously, the published status of the source, not the target
was used.

Also, correct display of the Navigation Links for the 'published' action.
This commit is contained in:
Jacques Distler 2008-12-01 22:58:09 -06:00
parent 11930dfabd
commit 5d47fdff8b
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/url_generator.rb
View file

@ -81,7 +81,9 @@ class UrlGenerator < AbstractUrlGenerator
end
when :publish
if known_page
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'published',
web = Web.find_by_address(web_address)
action = web.published? ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
else
@ -89,7 +91,9 @@ class UrlGenerator < AbstractUrlGenerator
end
else
if known_page
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'show',
web = Web.find_by_address(web_address)
action = web.published? ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
else