add_changeset_comment_to_diff_page.diff

Jonathan Monahan, 2014-07-01 09:36

Download (4.25 KB)

View differences:

app/views/repositories/_changeset.html.erb (working copy)
1
<h2><%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
2

  
3
<% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %>
4
<table class="revision-info">
5
  <% if @changeset.scmid.present? %>
6
    <tr>
7
      <td>ID</td><td><%= h(@changeset.scmid) %></td>
8
    </tr>
9
  <% end %>
10
  <% if @changeset.parents.present? %>
11
    <tr>
12
      <td><%= l(:label_parent_revision) %></td>
13
      <td>
14
        <%= @changeset.parents.collect{
15
              |p| link_to_revision(p, @repository, :text => format_revision(p))
16
            }.join(", ").html_safe %>
17
      </td>
18
    </tr>
19
  <% end %>
20
  <% if @changeset.children.present? %>
21
    <tr>
22
      <td><%= l(:label_child_revision) %></td>
23
      <td>
24
       <%= @changeset.children.collect{
25
              |p| link_to_revision(p, @repository, :text => format_revision(p))
26
             }.join(", ").html_safe %>
27
      </td>
28
    </tr>
29
  <% end %>
30
</table>
31
<% end %>
32

  
33
<p>
34
<span class="author">
35
<%= authoring(@changeset.committed_on, @changeset.author) %>
36
</span>
37
</p>
38

  
39
<%= textilizable @changeset.comments %>
40

  
41
<% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
42
  <%= render :partial => 'related_issues' %>
43
<% end %>
44

  
app/views/repositories/diff.html.erb (working copy)
1
<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
1
<%= render :partial => 'changeset', :locals => {:repository => @repository, :changeset => @changeset} %>
2 2

  
3 3
<!-- Choose view type -->
4 4
<%= form_tag({:action => 'diff', :id => @project,
app/views/repositories/revision.html.erb (working copy)
24 24
  <% end %>
25 25
</div>
26 26

  
27
<h2><%= avatar(@changeset.user, :size => "24") %><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
27
<%= render :partial => 'changeset', :locals => {:repository => @repository, :changeset => @changeset} %>
28 28

  
29
<% if @changeset.scmid.present? || @changeset.parents.present? || @changeset.children.present? %>
30
<table class="revision-info">
31
  <% if @changeset.scmid.present? %>
32
    <tr>
33
      <td>ID</td><td><%= h(@changeset.scmid) %></td>
34
    </tr>
35
  <% end %>
36
  <% if @changeset.parents.present? %>
37
    <tr>
38
      <td><%= l(:label_parent_revision) %></td>
39
      <td>
40
        <%= @changeset.parents.collect{
41
              |p| link_to_revision(p, @repository, :text => format_revision(p))
42
            }.join(", ").html_safe %>
43
      </td>
44
    </tr>
45
  <% end %>
46
  <% if @changeset.children.present? %>
47
    <tr>
48
      <td><%= l(:label_child_revision) %></td>
49
      <td>
50
       <%= @changeset.children.collect{
51
              |p| link_to_revision(p, @repository, :text => format_revision(p))
52
             }.join(", ").html_safe %>
53
      </td>
54
    </tr>
55
  <% end %>
56
</table>
57
<% end %>
58

  
59
<p>
60
<span class="author">
61
<%= authoring(@changeset.committed_on, @changeset.author) %>
62
</span>
63
</p>
64

  
65
<%= textilizable @changeset.comments %>
66

  
67
<% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
68
  <%= render :partial => 'related_issues' %>
69
<% end %>
70

  
71 29
<% if User.current.allowed_to?(:browse_repository, @project) %>
72 30
<h3><%= l(:label_attachment_plural) %></h3>
73 31
<ul id="changes-legend">