diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-11-03 11:34:09 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-11-03 11:34:09 +0000 |
| commit | cc79b6d04a6afadec66a596a0bafdc2cc73e728e (patch) | |
| tree | 3381014b98e7e15fa44133ff003b94c4ee9dcd6d /app | |
| parent | e1f3719634cde8709086068b94fc2bc56a6f7e67 (diff) | |
| download | redmine-cc79b6d04a6afadec66a596a0bafdc2cc73e728e.tar.gz redmine-cc79b6d04a6afadec66a596a0bafdc2cc73e728e.zip | |
scm: view: add parents and children on the revision page (#5501)
Contributed by Jan Topiński.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7721 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/repositories/revision.html.erb | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/app/views/repositories/revision.html.erb b/app/views/repositories/revision.html.erb index 85b11d441..000666e85 100644 --- a/app/views/repositories/revision.html.erb +++ b/app/views/repositories/revision.html.erb @@ -25,8 +25,38 @@ <h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2> -<p><% if @changeset.scmid %>ID: <%= h(@changeset.scmid) %><br /><% end %> -<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p> +<table class="revision-info"> + <% if @changeset.scmid %> + <tr> + <td>ID</td><td><%= h(@changeset.scmid) %></td> + </tr> + <% end %> + <% unless @changeset.parents.blank? %> + <tr> + <td><%= l(:label_parent_revision) %></td> + <td> + <%= @changeset.parents.collect{ + |p| link_to_revision(p, @project, :text => format_revision(p)) + }.join(", ") %><br /> + </td> + </tr> + <% end %> + <% unless @changeset.children.blank? %> + <tr> + <td><%= l(:label_child_revision) %></td> + <td> + <%= @changeset.children.collect{ + |p| link_to_revision(p, @project, :text => format_revision(p)) + }.join(", ") %><br /> + </td> + </tr> + <% end %> +</table> +<p> +<span class="author"> +<%= authoring(@changeset.committed_on, @changeset.author) %> +</span> +</p> <%= textilizable @changeset.comments %> |