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

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-06-12 19:49:34 -05:00
commit 191f7b3b2c
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/url_generator.rb
View file

@ -87,7 +87,7 @@ class UrlGenerator < AbstractUrlGenerator
end end
def page_link(mode, name, text, web_address, known_page) def page_link(mode, name, text, web_address, known_page)
return %{<span class='wikilink-error'><b>Illegal link (contains a '.'):</b> [[#{text}]]</span>} if text.include?('.') return %{<span class='wikilink-error'><b>Illegal link (target contains a '.'):</b> #{name}</span>} if name.include?('.')
case mode case mode
when :export when :export
if known_page if known_page

2
test/test_helper.rb
View file

@ -127,7 +127,7 @@ class StubUrlGenerator < AbstractUrlGenerator
def page_link(mode, name, text, web_address, known_page) def page_link(mode, name, text, web_address, known_page)
link = CGI.escape(name) link = CGI.escape(name)
return %{<span class='wikilink-error'><b>Illegal link (contains a '.'):</b> [[#{text}]]</span>} if text.include?('.') return %{<span class='wikilink-error'><b>Illegal link (target contains a '.'):</b> #{name}</span>} if name.include?('.')
case mode case mode
when :export when :export
if known_page then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>} if known_page then %{<a class="existingWikiWord" href="#{link}.html">#{text}</a>}

2
test/unit/page_test.rb
View file

@ -161,7 +161,7 @@ class PageTest < ActiveSupport::TestCase
references = new_page.wiki_references(true) references = new_page.wiki_references(true)
assert_equal( "<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>Happy Page</a>" + assert_equal( "<p>Reference to <a class='existingWikiWord' href='\.\./show/MyPage'>Happy Page</a>" +
" and to <span class='newWikiWord'>Wanted Page2<a href='../show/WantedPage2'>?</a></span>.pdf " + " and to <span class='newWikiWord'>Wanted Page2<a href='../show/WantedPage2'>?</a></span>.pdf " +
"and <span class='wikilink-error'><b>Illegal link (contains a &#39;.&#39;):</b> [[foo.pdf]]</span></p>", "and <span class='wikilink-error'><b>Illegal link (target contains a &#39;.&#39;):</b> foo.pdf</span></p>",
test_renderer(new_page.revisions.last).display_content(true) ) test_renderer(new_page.revisions.last).display_content(true) )
assert_equal 3, references.size assert_equal 3, references.size
# now it works. # now it works.