Inline images alt attribute set to the attachment description.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1328 e93f8b46-1217-0410-a6f0-8f06a7374b81

Inline images alt attribute set to the attachment description.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1328 e93f8b46-1217-0410-a6f0-8f06a7374b81
c37abb64 · Jean-Philippe Lang · c6271d83 · c37abb64 · c37abb64 · c37abb64
Commit c37abb64 authored Apr 05, 2008 by Jean-Philippe Lang
Showing with 7 additions and 3 deletions

application_helper.rb app/helpers/application_helper.rb +4 -2

attachments.yml test/fixtures/attachments.yml +1 -0

wiki_controller_test.rb test/functional/wiki_controller_test.rb +2 -1

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -207,8 +207,10 @@ module ApplicationHelper
        rf = Regexp.new(filename,  Regexp::IGNORECASE)
        # search for the picture in attachments
        if found = attachments.detect { |att| att.filename =~ rf }
-          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
-          "!#{style}#{image_url}!"
+          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
+          desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
+          alt = desc.blank? ? nil : "(#{desc})"
+          "!#{style}#{image_url}#{alt}!"
        else
          "!#{style}#{filename}!"
        end

--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -34,5 +34,6 @@ attachments_003:
  container_type: WikiPage
  filesize: 280
  filename: logo.gif
+  description: This is a logo
  author_id: 2
  
\ No newline at end of file
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -45,7 +45,8 @@ class WikiControllerTest < Test::Unit::TestCase
    assert_tag :tag => 'h1', :content => /Another page/
    # Included page with an inline image
    assert_tag :tag => 'p', :content => /This is an inline image/
-    assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3' }
+    assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3',
+                                               :alt => 'This is a logo' }
  end
  
  def test_show_unexistent_page_without_edit_right