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

Uploaded Pictures Should Display in "Published" Mode

Browse source
This commit is contained in:
Jacques Distler 2008-12-20 13:56:50 -06:00
parent 5a86d874f7
commit 1f816af24b
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/url_generator.rb
View file

@ -105,6 +105,8 @@ class UrlGenerator < AbstractUrlGenerator
end end
def pic_link(mode, name, text, web_address, known_pic) def pic_link(mode, name, text, web_address, known_pic)
href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
:id => name
case mode case mode
when :export when :export
if known_pic if known_pic
@ -114,13 +116,11 @@ class UrlGenerator < AbstractUrlGenerator
end end
when :publish when :publish
if known_pic if known_pic
%{<img alt="#{text}" src="#{CGI.escape(name)}" />} %{<img alt="#{text}" src="#{href}" />}
else else
%{<span class="newWikiWord">#{text}</span>} %{<span class="newWikiWord">#{text}</span>}
end end
else else
href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file',
:id => name
if known_pic if known_pic
%{<img alt="#{text}" src="#{href}" />} %{<img alt="#{text}" src="#{href}" />}
else else

7
test/functional/file_controller_test.rb
View file

@ -104,6 +104,13 @@ class FileControllerTest < Test::Unit::TestCase
:description => 'Rails, end-to-end'} :description => 'Rails, end-to-end'}
assert @web.has_file?('rails-e2e.gif') assert @web.has_file?('rails-e2e.gif')
assert_equal(picture, WikiFile.find_by_file_name('rails-e2e.gif').content) assert_equal(picture, WikiFile.find_by_file_name('rails-e2e.gif').content)
PageRenderer.setup_url_generator(StubUrlGenerator.new)
@wiki.revise_page('wiki1', 'HomePage', 'Try [[rails-e2e.gif:pic]] again.',
Time.now, 'AnonymousBrave', renderer)
assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
renderer.display_content
assert_equal "<p>Try <img alt='Rails, end-to-end' src='../file/rails-e2e.gif'/> again.</p>",
renderer.display_published
end end
def test_import def test_import

2
test/test_helper.rb
View file

@ -154,7 +154,7 @@ class StubUrlGenerator < AbstractUrlGenerator
if known_pic then %{<img alt="#{text}" src="#{link}" />} if known_pic then %{<img alt="#{text}" src="#{link}" />}
else %{<img alt="#{text}" src="no image" />} end else %{<img alt="#{text}" src="no image" />} end
when :publish when :publish
if known_pic then %{<img alt="#{text}" src="#{link}" />} if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
else %{<span class="newWikiWord">#{text}</span>} end else %{<span class="newWikiWord">#{text}</span>} end
else else
if known_pic then %{<img alt="#{text}" src="../file/#{link}" />} if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}