Browse Source

scm: changing two revision diff text at SCM adapter level (#3724).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4698 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/1.2.0
Toshi MARUYAMA 13 years ago
parent
commit
ebb19c5863

+ 2
- 1
app/controllers/repositories_controller.rb View File

@@ -177,9 +177,10 @@ class RepositoriesController < ApplicationController

@changeset = @repository.find_changeset_by_name(@rev)
@changeset_to = @rev_to ? @repository.find_changeset_by_name(@rev_to) : nil
@diff_format_revisions = @repository.diff_format_revisions(@changeset, @changeset_to)
end
end
def stats
end

+ 8
- 1
app/models/repository.rb View File

@@ -86,7 +86,14 @@ class Repository < ActiveRecord::Base
def diff(path, rev, rev_to)
scm.diff(path, rev, rev_to)
end

def diff_format_revisions(cs, cs_to, sep=':')
text = ""
text << cs_to.format_identifier + sep if cs_to
text << cs.format_identifier if cs
text
end

# Returns a path relative to the url of the repository
def relative_path(path)
path

+ 1
- 1
app/views/repositories/diff.rhtml View File

@@ -1,4 +1,4 @@
<h2><%= l(:label_revision) %> <%= format_revision(@changeset_to) + ':' if @changeset_to %><%= format_revision(@changeset) %> <%=h @path %></h2>
<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>

<!-- Choose view type -->
<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>

Loading…
Cancel
Save