jro_apps/redmine Commit - r13082:3a0a55c8ba37

Merged r13451 (#18119)....

Jean-Philippe Lang -

r13082:3a0a55c8ba37

parent child

Context file:

r13082:3a0a55c8ba37

Collapse all files

app/helpers/application_helper.rb +1 -1

                 end
                 return '' if text.blank?
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
-                only_path = options.delete(:only_path) == false ? false : true
+                @only_path = only_path = options.delete(:only_path) == false ? false : true
                 text = text.dup
                 macros = catch_macros(text)

lib/redmine/wiki_formatting/macros.rb +2 -2

                     size = nil unless size > 0
                     if obj && obj.respond_to?(:attachments) && attachment = Attachment.latest_attach(obj.attachments, filename)
                       title = options[:title] || attachment.title
-                      thumbnail_url = url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment, :size => size, :only_path => false)
+                      thumbnail_url = url_for(:controller => 'attachments', :action => 'thumbnail', :id => attachment, :size => size, :only_path => @only_path)
-                      image_url = url_for(:controller => 'attachments', :action => 'show', :id => attachment, :only_path => false)
+                      image_url = url_for(:controller => 'attachments', :action => 'show', :id => attachment, :only_path => @only_path)
                       img = image_tag(thumbnail_url, :alt => attachment.filename)
                       link_to(img, image_url, :class => 'thumbnail', :title => title)

test/unit/lib/redmine/wiki_formatting/macros_test.rb +14 -5

               end
               def test_macro_thumbnail
+                link = link_to('<img alt="testfile.PNG" src="/attachments/thumbnail/17" />'.html_safe,
+                               "/attachments/17",
+                               :class => "thumbnail",
+                               :title => "testfile.PNG")
+                assert_equal "<p>#{link}</p>",
+                             textilizable("{{thumbnail(testfile.png)}}", :object => Issue.find(14))
+              end
+              def test_macro_thumbnail_with_full_path
                 link = link_to('<img alt="testfile.PNG" src="http://test.host/attachments/thumbnail/17" />'.html_safe,
                                "http://test.host/attachments/17",
                                :class => "thumbnail",
                                :title => "testfile.PNG")
                 assert_equal "<p>#{link}</p>",
-                             textilizable("{{thumbnail(testfile.png)}}", :object => Issue.find(14))
+                             textilizable("{{thumbnail(testfile.png)}}", :object => Issue.find(14), :only_path => false)
               end
               def test_macro_thumbnail_with_size
-                link = link_to('<img alt="testfile.PNG" src="http://test.host/attachments/thumbnail/17/200" />'.html_safe,
+                link = link_to('<img alt="testfile.PNG" src="/attachments/thumbnail/17/200" />'.html_safe,
-                               "http://test.host/attachments/17",
+                               "/attachments/17",
                                :class => "thumbnail",
                                :title => "testfile.PNG")
                 assert_equal "<p>#{link}</p>",
               end
               def test_macro_thumbnail_with_title
-                link = link_to('<img alt="testfile.PNG" src="http://test.host/attachments/thumbnail/17" />'.html_safe,
+                link = link_to('<img alt="testfile.PNG" src="/attachments/thumbnail/17" />'.html_safe,
-                               "http://test.host/attachments/17",
+                               "/attachments/17",
                                :class => "thumbnail",
                                :title => "Cool image")
                 assert_equal "<p>#{link}</p>",

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages