jro_apps/redmine Commit - r3337:d18fba4ffe90

Fixed: Pound (#) followed by number with leading zero (0) removes leading zero when rendered in wiki (#4872)....

Jean-Philippe Lang -

r3337:d18fba4ffe90

parent child

Context file:

r3337:d18fba4ffe90

Collapse all files

app/helpers/application_helper.rb +6 -6

                 #  Forum messages:
                 #     message#1218 -> Link to message with id 1218
                 text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message|project)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|,|\s|<|$)}) do |m|
-                  leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
+                  leading, esc, prefix, sep, identifier = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
-                      if project && (changeset = project.changesets.find_by_revision(oid))
+                      if project && (changeset = project.changesets.find_by_revision(identifier))
-                        link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
+                        link = link_to("r#{identifier}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
                                                   :class => 'changeset',
                                                   :title => truncate_single_line(changeset.comments, :length => 100))
                       end
                     elsif sep == '#'
-                      oid = oid.to_i
+                      oid = identifier.to_i
                       case prefix
                       when nil
                         if issue = Issue.visible.find_by_id(oid, :include => :status)
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
-                      name = oid.gsub(%r{^"(.*)"$}, "\\1")
+                      name = identifier.gsub(%r{^"(.*)"$}, "\\1")
                       case prefix
                       when 'document'
                         if project && document = project.documents.find_by_title(name)
                       end
                     end
                   end
-                  leading + (link || "#{prefix}#{sep}#{oid}")
+                  leading + (link || "#{prefix}#{sep}#{identifier}")
                 end
                 text

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

                   '!version:1.0'                => 'version:1.0',
                   '!version:"1.0"'              => 'version:"1.0"',
                   '!source:/some/file'          => 'source:/some/file',
+                  # not found
+                  '#0123456789'                 => '#0123456789',
                   # invalid expressions
                   'source:'                     => 'source:',
                   # url hash

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