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

Links in Published Webs

Browse source 
Links in the 'show' action should be to the 'show' action.
Links in the 'published' action should be to the 'published' action.
Try to focus, Distler!
This commit is contained in:
Jacques Distler 2009-02-01 16:17:14 -06:00
parent 1cdf0536c1
commit 43aadecc99
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/url_generator.rb
View file

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

7
test/functional/wiki_controller_test.rb
View file

@ -319,6 +319,13 @@ class WikiControllerTest < Test::Unit::TestCase
assert_response(:success) assert_response(:success)
assert_equal @home, r.template_objects['page'] assert_equal @home, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='http:\/\/test.host\/wiki1\/published\/ThatWay'>That Way<\/a>/, r.body
r = process('show', 'web' => 'wiki1', 'id' => 'HomePage')
assert_response(:success)
assert_equal @home, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='http:\/\/test.host\/wiki1\/show\/ThatWay'>That Way<\/a>/, r.body
end end