jro_apps/redmine Commit - r1728:16509203398f

Adds links to forum messages using message#id syntax (#1756)....

Jean-Philippe Lang -

r1728:16509203398f

parent child

Context file:

r1728:16509203398f

Collapse all files

app/helpers/application_helper.rb +13 -1

                 #     source:some/file#L120 -> Link to line 120 of the file
                 #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
                 #     export:some/file -> Force the download of the file
-                text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
+                #  Forum messages:
+                #     message#1218 -> Link to message with id 1218
+                text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
                   leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
                   link = nil
                   if esc.nil?
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
+                      when 'message'
+                        if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
+                          link = link_to h(truncate(message.subject, 60)), {:only_path => only_path,
+                                                                            :controller => 'messages',
+                                                                            :action => 'show',
+                                                                            :board_id => message.board,
+                                                                            :id => message.root,
+                                                                            :anchor => (message.parent ? "message-#{message.id}" : nil)},
+                                                             :class => 'message'
+                        end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any

test/unit/helpers/application_helper_test.rb +10 -1

             class ApplicationHelperTest < HelperTestCase
               include ApplicationHelper
               include ActionView::Helpers::TextHelper
-              fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents, :roles, :enabled_modules
+              fixtures :projects, :roles, :enabled_modules,
+                                  :repositories, :changesets,
+                                  :trackers, :issue_statuses, :issues, :versions, :documents,
+                                  :wikis, :wiki_pages, :wiki_contents,
+                                  :boards, :messages
               def setup
                 super
                 version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                               :class => 'version')
+                message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
                 source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
                 source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
                   'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
                   'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
+                  # message
+                  'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
+                  'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5'), :class => 'message'),
                   # escaping
                   '!#3.'                        => '#3.',
                   '!r1'                         => 'r1',

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