jro_apps/redmine Commit - r10510:d02e5e54a825

Merged r10580 and r10581 from trunk....

Jean-Philippe Lang -

r10510:d02e5e54a825

parent child

Context file:

r10510:d02e5e54a825

Collapse all files

app/helpers/application_helper.rb +2 -3

                              if repository && User.current.allowed_to?(:browse_repository, project)
                                name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
                                path, rev, anchor = $1, $3, $5
-                               link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :repository_id => repository.identifier_param,
+                               link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
                                                                        :path => to_path_param(path),
                                                                        :rev => rev,
-                                                                       :anchor => anchor,
-                                                                       :format => (prefix == 'export' ? 'raw' : nil)},
+                                                                       :anchor => anchor},
                                                                       :class => (prefix == 'export' ? 'source download' : 'source')
                              end
                            end

test/unit/helpers/application_helper_test.rb +19 -8

                  project_url = {:controller => 'projects', :action => 'show', :id => 'subproject1'}
-                 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_url = '/projects/ecookbook/repository/entry/some/file'
+                 source_url_with_rev = '/projects/ecookbook/repository/revisions/52/entry/some/file'
+                 source_url_with_ext = '/projects/ecookbook/repository/entry/some/file.ext'
+                 source_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/entry/some/file.ext'
+                 export_url = '/projects/ecookbook/repository/raw/some/file'
+                 export_url_with_rev = '/projects/ecookbook/repository/revisions/52/raw/some/file'
+                 export_url_with_ext = '/projects/ecookbook/repository/raw/some/file.ext'
+                 export_url_with_rev_and_ext = '/projects/ecookbook/repository/revisions/52/raw/some/file.ext'
                  to_test = {
                    # tickets
                    'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
                    'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
                    'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
-                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
-                   'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
-                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
-                   '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'),
+                   'source:/some/file@52'        => link_to('source:/some/file@52', source_url_with_rev, :class => 'source'),
+                   'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_rev_and_ext, :class => 'source'),
+                   'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url + "#L110", :class => 'source'),
+                   'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext + "#L110", :class => 'source'),
+                   'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url_with_rev + "#L110", :class => 'source'),
+                   # export
+                   'export:/some/file'           => link_to('export:/some/file', export_url, :class => 'source download'),
+                   'export:/some/file.ext'       => link_to('export:/some/file.ext', export_url_with_ext, :class => 'source download'),
+                   'export:/some/file@52'        => link_to('export:/some/file@52', export_url_with_rev, :class => 'source download'),
+                   'export:/some/file.ext@52'    => link_to('export:/some/file.ext@52', export_url_with_rev_and_ext, :class => 'source download'),
                    # forum
                    'forum#2'                     => link_to('Discussion', board_url, :class => 'board'),
                    'forum:Discussion'            => link_to('Discussion', board_url, :class => 'board'),

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