Merged r19663 to 4.1-stable (#32765).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19668 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 966a256b51a0e10ea7155c8653bfb42669004fa4..e8284a06eeb5a7024252fe5d314e563661bb8502 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1039,10 +1039,10 @@ module ApplicationHelper
                 url = issue_url(issue, :only_path => only_path, :anchor => anchor)
                 link =
                   if sep == '##'
-                    link_to("#{issue.tracker.name} ##{oid}#{comment_suffix}",
+                    link_to("#{issue.tracker.name} ##{oid}#{comment_suffix}: #{issue.subject}",
                             url,
                             :class => issue.css_classes,
-                            :title => "#{issue.tracker.name}: #{issue.subject.truncate(100)} (#{issue.status.name})") + ": #{issue.subject}"
+                            :title => "#{l(:field_status)}: #{issue.status.name}")
                   else
                     link_to("##{oid}#{comment_suffix}",
                             url,

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 65c373874b60443b0aa67116211f314b97f26c97..3fc1f90ade2837d347e50e51c9beeb49cc6157ae 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -309,11 +309,10 @@ class ApplicationHelperTest < Redmine::HelperTest
                          :class => Issue.find(3).css_classes,
                          :title => 'Bug: Error 281 when updating a recipe (New)')
     ext_issue_link = link_to(
-                         'Bug #3',
+                         'Bug #3: Error 281 when updating a recipe',
                          {:controller => 'issues', :action => 'show', :id => 3},
                          :class => Issue.find(3).css_classes,
-                         :title => 'Bug: Error 281 when updating a recipe (New)') +
-                           ": Error 281 when updating a recipe"
+                         :title => 'Status: New')
     note_link = link_to(
                          '#3-14',
                          {:controller => 'issues', :action => 'show',
@@ -321,12 +320,11 @@ class ApplicationHelperTest < Redmine::HelperTest
                          :class => Issue.find(3).css_classes,
                          :title => 'Bug: Error 281 when updating a recipe (New)')
     ext_note_link = link_to(
-                         'Bug #3-14',
+                         'Bug #3-14: Error 281 when updating a recipe',
                          {:controller => 'issues', :action => 'show',
                           :id => 3, :anchor => 'note-14'},
                          :class => Issue.find(3).css_classes,
-                         :title => 'Bug: Error 281 when updating a recipe (New)') +
-                           ": Error 281 when updating a recipe"
+                         :title => 'Status: New')
     note_link2 = link_to(
                          '#3#note-14',
                          {:controller => 'issues', :action => 'show',
@@ -334,12 +332,11 @@ class ApplicationHelperTest < Redmine::HelperTest
                          :class => Issue.find(3).css_classes,
                          :title => 'Bug: Error 281 when updating a recipe (New)')
     ext_note_link2 = link_to(
-                         'Bug #3#note-14',
+                         'Bug #3#note-14: Error 281 when updating a recipe',
                          {:controller => 'issues', :action => 'show',
                           :id => 3, :anchor => 'note-14'},
                          :class => Issue.find(3).css_classes,
-                         :title => 'Bug: Error 281 when updating a recipe (New)') +
-                           ": Error 281 when updating a recipe"
+                         :title => 'Status: New')
 
     revision_link = link_to(
                          'r1',
@@ -398,10 +395,10 @@ class ApplicationHelperTest < Redmine::HelperTest
       # should not ignore leading zero
       '#03'                         => '#03',
       # tickets with more info
-      '##3, [##3], (##3) and ##3.'      => "#{ext_issue_link}, [#{ext_issue_link}], (#{ext_issue_link}) and #{ext_issue_link}.",
-      '##3-14'                       => ext_note_link,
-      '##3#note-14'                  => ext_note_link2,
-      '##03'                         => '##03',
+      '##3, [##3], (##3) and ##3.'  => "#{ext_issue_link}, [#{ext_issue_link}], (#{ext_issue_link}) and #{ext_issue_link}.",
+      '##3-14'                      => ext_note_link,
+      '##3#note-14'                 => ext_note_link2,
+      '##03'                        => '##03',
       # changesets
       'r1'                          => revision_link,
       'r1.'                         => "#{revision_link}.",