jro_apps/redmine Commit - r3467:2f5c17a0f6ea

Optimization: load attachments when needed....

Jean-Philippe Lang -

r3467:2f5c17a0f6ea

parent child

Context file:

r3467:2f5c17a0f6ea

Collapse all files

app/helpers/application_helper.rb +4 -5

                 only_path = options.delete(:only_path) == false ? false : true
                 # when using an image link, try to use an attachment, if possible
-                attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
+                if options[:attachments] || (obj && obj.respond_to?(:attachments))
+                  attachments = nil
-                if attachments
-                  attachments = attachments.sort_by(&:created_on).reverse
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
+                    attachments ||= (options[:attachments] || obj.attachments).sort_by(&:created_on).reverse
                     # search for the picture in attachments
                     if found = attachments.detect { |att| att.filename.downcase == filename }
                       image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
                                                                  :class => (prefix == 'export' ? 'source download' : 'source')
                         end
                       when 'attachment'
+                        attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
                         if attachments && attachment = attachments.detect {|a| a.filename == name }
                           link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
                                                                  :class => 'attachment'

test/unit/helpers/application_helper_test.rb +8 0

                 to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text), "#{text} failed" }
               end
+              def test_attachment_links
+                attachment_link = link_to('error281.txt', {:controller => 'attachments', :action => 'download', :id => '1'}, :class => 'attachment')
+                to_test = {
+                  'attachment:error281.txt'      => attachment_link
+                }
+                to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text, :attachments => Issue.find(3).attachments), "#{text} failed" }
+              end
               def test_wiki_links
                 to_test = {
                   '[[CookBook documentation]]' => '<a href="/projects/ecookbook/wiki/CookBook_documentation" class="wiki-page">CookBook documentation</a>',

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