jro_apps/redmine Commit - r4578:ebb19c58637c

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

Toshi MARUYAMA -

r4578:ebb19c58637c

parent child

Context file:

r4578:ebb19c58637c

app/controllers/repositories_controller.rb +2 -1

                   @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

app/models/repository.rb +8 -1

               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

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

-            <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 %>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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