diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-11 19:18:37 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-11 19:18:37 +0000 |
| commit | f3d1aa53599a01a3a9f47169d626339d912c774c (patch) | |
| tree | 00c45c589f804c92639b62ec2964a9e2ceb3f32b | |
| parent | f5768cc99bcdffbafa588eb68c17cca599eff036 (diff) | |
| download | redmine-f3d1aa53599a01a3a9f47169d626339d912c774c.tar.gz redmine-f3d1aa53599a01a3a9f47169d626339d912c774c.zip | |
Issue-notes Redmine links: append actual note reference to rendered links (#12912).
Patch by YOSHITANI Mitsuhiro.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12005 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fbf14b3d1..62e7b2697 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -699,7 +699,7 @@ module ApplicationHelper when nil if oid.to_s == identifier && issue = Issue.visible.find_by_id(oid, :include => :status) anchor = comment_id ? "note-#{comment_id}" : nil - link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid, :anchor => anchor}, + link = link_to(h("##{oid}#{comment_suffix}"), {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid, :anchor => anchor}, :class => issue.css_classes, :title => "#{truncate(issue.subject, :length => 100)} (#{issue.status.name})") end diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index 18d0372c3..419a1b330 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -268,7 +268,9 @@ RAW def test_redmine_links issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3}, :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)') - note_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'}, + note_link = link_to('#3-14', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'}, + :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)') + note_link2 = link_to('#3#note-14', {:controller => 'issues', :action => 'show', :id => 3, :anchor => 'note-14'}, :class => Issue.find(3).css_classes, :title => 'Error 281 when updating a recipe (New)') revision_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1}, @@ -311,7 +313,7 @@ RAW '#3, [#3], (#3) and #3.' => "#{issue_link}, [#{issue_link}], (#{issue_link}) and #{issue_link}.", # ticket notes '#3-14' => note_link, - '#3#note-14' => note_link, + '#3#note-14' => note_link2, # should not ignore leading zero '#03' => '#03', # changesets |