jro_apps/redmine Commit - r11775:f3d1aa53599a

Issue-notes Redmine links: append actual note reference to rendered links (#12912)....

Jean-Philippe Lang -

r11775:f3d1aa53599a

parent child

Context file:

r11775:f3d1aa53599a

Collapse all files

app/helpers/application_helper.rb +1 -1

                       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

test/unit/helpers/application_helper_test.rb +4 -2

               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},
                   '#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

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