jro_apps/redmine Commit - r1697:198a8c602dc1

Adds support for wiki links with anchor (#1647)....

Jean-Philippe Lang -

r1697:198a8c602dc1

parent child

Context file:

r1697:198a8c602dc1

Collapse all files

app/helpers/application_helper.rb +9 -4

                 case options[:wiki_links]
                 when :local
                   # used for local links to html files
-                  format_wiki_link = Proc.new {|project, title| "#{title}.html" }
+                  format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
                 when :anchor
                   # used for single-file wiki export
-                  format_wiki_link = Proc.new {|project, title| "##{title}" }
+                  format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
                 else
-                  format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
+                  format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
                 end
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                     end
                     if link_project && link_project.wiki
+                      # extract anchor
+                      anchor = nil
+                      if page =~ /^(.+?)\#(.+)$/
+                        page, anchor = $1, $2
+                      end
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
-                      link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
+                      link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                                :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist

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

                 to_test = {
                   '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
                   '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
+                  # link with anchor
+                  '[[CookBook documentation#One-section]]' => '<a href="/wiki/ecookbook/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
+                  '[[Another page#anchor|Page]]' => '<a href="/wiki/ecookbook/Another_page#anchor" class="wiki-page">Page</a>',
                   # page that doesn't exist
                   '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
                   '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',

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