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

Links From Published Webs

Browse source 
Damn, but it's hard to get this right.
I think I've finally done it, though.
We'll see ...
This commit is contained in:
Jacques Distler 2009-10-22 17:57:13 -05:00
parent 97a35e280b
commit 761f8bbb51
3 changed files with 61 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/url_generator.rb
View file

@ -98,19 +98,13 @@ class UrlGenerator < AbstractUrlGenerator
end
when :publish
if known_page
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'published',
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
wikilink_for(mode, name, text, web_address)
else
%{<span class="newWikiWord">#{text}</span>}
end
when :show
if known_page
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>}
wikilink_for(mode, name, text, web_address)
else
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
:id => name, :only_path => true
@ -118,11 +112,7 @@ class UrlGenerator < AbstractUrlGenerator
end
else
if known_page
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, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
wikilink_for(mode, name, text, web_address)
else
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
:id => name, :only_path => true
@ -190,5 +180,14 @@ class UrlGenerator < AbstractUrlGenerator
%{<span class="deleteWikiWord">[[#{name}:delete]]</span>}
end
end
private
def wikilink_for(mode, name, text, web_address)
web = Web.find_by_address(web_address)
action = web.published? && !(web == @web && mode != :publish) ? '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>}
end
end