diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-15 18:19:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-01-15 18:19:19 +0000 |
| commit | 1bd5e58c847816ae5751ee0026e55597d1541dd4 (patch) | |
| tree | b5c1be1f966f8b08986978713882856d014e363d /app/helpers | |
| parent | d996cc0584901e7f44171093b170f882978124f7 (diff) | |
| download | redmine-1bd5e58c847816ae5751ee0026e55597d1541dd4.tar.gz redmine-1bd5e58c847816ae5751ee0026e55597d1541dd4.zip | |
Adds support for multiple repositories per project (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8650 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 7 | ||||
| -rw-r--r-- | app/helpers/repositories_helper.rb | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1954351e5..968420041 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -106,12 +106,15 @@ module ApplicationHelper # Generates a link to a SCM revision # Options: # * :text - Link text (default to the formatted revision) - def link_to_revision(revision, project, options={}) + def link_to_revision(revision, repository, options={}) + if repository.is_a?(Project) + repository = repository.repository + end text = options.delete(:text) || format_revision(revision) rev = revision.respond_to?(:identifier) ? revision.identifier : revision link_to( h(text), - {:controller => 'repositories', :action => 'revision', :id => project, :rev => rev}, + {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev}, :title => l(:label_revision_id, format_revision(revision)) ) end diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index f3b229f2c..24807139e 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -92,6 +92,7 @@ module RepositoriesHelper text = link_to(h(text), :controller => 'repositories', :action => 'show', :id => @project, + :repository_id => @repository.identifier_param, :path => path_param, :rev => @changeset.identifier) output << "<li class='#{style}'>#{text}" @@ -103,12 +104,14 @@ module RepositoriesHelper text = link_to(h(text), :controller => 'repositories', :action => 'entry', :id => @project, + :repository_id => @repository.identifier_param, :path => path_param, :rev => @changeset.identifier) unless c.action == 'D' text << " - #{h(c.revision)}" unless c.revision.blank? text << ' ('.html_safe + link_to(l(:label_diff), :controller => 'repositories', :action => 'diff', :id => @project, + :repository_id => @repository.identifier_param, :path => path_param, :rev => @changeset.identifier) + ') '.html_safe if c.action == 'M' text << ' '.html_safe + content_tag('span', h(c.from_path), :class => 'copied-from') unless c.from_path.blank? |